| commit | f97765580be7f85a5e04168edffe0fd5350694d6 | [log] [tgz] |
|---|---|---|
| author | Akshay Thakker <aksh@google.com> | Mon Aug 12 14:11:45 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 12 14:11:45 2019 -0700 |
| tree | df45f8446f42ea1d6a675a15a0f56fe8fac4674e | |
| parent | 870e351f6a6b9fb7cd90dfe406e1f770f0fcf7d0 [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: I1e4c73781e4cbbb538a5e61446a8f4533d4dccde