commit | 328d9520f71756904025bf4fcb274e97f51fed1e | [log] [tgz] |
---|---|---|
author | Akshay Thakker <aksh@google.com> | Mon Aug 12 14:21:47 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Aug 12 14:21:47 2019 -0700 |
tree | df45f8446f42ea1d6a675a15a0f56fe8fac4674e | |
parent | f97765580be7f85a5e04168edffe0fd5350694d6 [diff] | |
parent | e171c1eb51139fd2b34d65f3d7d1e1fa19207b36 [diff] |
[automerger skipped] Merge "Revert "aacenc: fix timestamp off by one frame"" into qt-dev am: b2f9f22cfa -s ours am: e171c1eb51 -s ours am skip reason: change_id I567890f3d04544c12adfe29a6a23c06f1db699e7 with SHA1 8c886ae968 is in history Change-Id: I72c1d269d2ab571bb69120f44fd19f5c3388e136