commit | d62a7df852a91c3363bd975719f1f180765609a9 | [log] [tgz] |
---|---|---|
author | Akshay Thakker <aksh@google.com> | Mon Aug 12 14:22:44 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Aug 12 14:22:44 2019 -0700 |
tree | d64ef426294749fb14032b369c119288d8b6d2cb | |
parent | 2ab28960d73d4d6b74be52d85b32b0510c750148 [diff] | |
parent | f97765580be7f85a5e04168edffe0fd5350694d6 [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 skip reason: change_id I567890f3d04544c12adfe29a6a23c06f1db699e7 with SHA1 8c886ae968 is in history Change-Id: I55492ab4cdd04f3a1b8cc7363a80dfb6b2f600f5