tree 0fc679d726afafaa728f1d0050efd9b8a5b0f592
parent 92272ab18945d93e7569fc73692220bf1365af36
parent 3d6576efd025641182ec0145c9a03e5b9c26c6ef
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."