| commit | 3eef436cea1928f96b789449ea144d1a529d2651 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Wed Sep 10 19:47:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 10 19:47:58 2014 +0000 |
| tree | 2670e3652843a4917d9b54a1e849b43aeeb4cd74 | |
| parent | f2745669be588f8bc8fdb3dea60a12d91f6eb9c9 [diff] | |
| parent | 43f2e3cf20c2a99cd3e9b99c8b507143e2954756 [diff] |
am 43f2e3cf: Merge "Revert "Fix AAC timestamps for multiple aac frames per input buffer"" into lmp-dev * commit '43f2e3cf20c2a99cd3e9b99c8b507143e2954756': Revert "Fix AAC timestamps for multiple aac frames per input buffer"