commit | 08d7cdcc11eed08c30adf1f118b8d6dd500b7897 | [log] [tgz] |
---|---|---|
author | Akshay Thakker <aksh@google.com> | Mon Aug 12 14:32:55 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Aug 12 14:32:55 2019 -0700 |
tree | d64ef426294749fb14032b369c119288d8b6d2cb | |
parent | d2ba95c3afdffa01397debe14eb8e6672dbe939f [diff] | |
parent | 2468cb009a0c5ae191a9353fac998c3021465c50 [diff] |
[automerger skipped] Merge "Revert "aacenc: fix timestamp off by one frame"" into qt-dev am: b2f9f22cfa -s ours am: b279c8c347 -s ours am: 2468cb009a -s ours am skip reason: change_id I567890f3d04544c12adfe29a6a23c06f1db699e7 with SHA1 8c886ae968 is in history Change-Id: If839496ac0084f367b8eb7cab8c4ffb91d8d8d21