| commit | e82542844f05a7bbb2f99a332af10af596940725 | [log] [tgz] |
|---|---|---|
| author | Akshay Thakker <aksh@google.com> | Mon Aug 12 14:30:49 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 12 14:30:49 2019 -0700 |
| tree | 64246320ef987627a9b0f7dd164e9cc649549ab2 | |
| parent | 72e9b14d858b5850109b13d5e273c2d675040383 [diff] | |
| parent | d62a7df852a91c3363bd975719f1f180765609a9 [diff] |
[automerger skipped] Merge "Revert "aacenc: fix timestamp off by one frame"" into qt-dev am: b2f9f22cfa -s ours am: b279c8c347 -s ours am: f97765580b -s ours am: d62a7df852 -s ours am skip reason: change_id I567890f3d04544c12adfe29a6a23c06f1db699e7 with SHA1 8c886ae968 is in history Change-Id: I6f24a707e0b0c531dae2d22055e56a395def7e20