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