tree f41167f435fd3f660a8b25c1d16228329b8bd939
parent d27f1e6959cdcdadfa471b9824686d784ca55def
parent 41dabbcd9ab62d7ecea1570cc76c39ac485de2ce
author Andreas Huber <andih@google.com> 1292433441 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1292433441 -0800

Merge "Emit better (correct) timestamps that respect AAC upsampling."