| commit | 39d766372220af912a8912e6487f4626d56a6d04 | [log] [tgz] |
|---|---|---|
| author | Akshay Thakker <aksh@google.com> | Mon Aug 12 14:41:48 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 12 14:41:48 2019 -0700 |
| tree | 64246320ef987627a9b0f7dd164e9cc649549ab2 | |
| parent | 7f1ac59d0c25805bb57c37652750f1a558e95fde [diff] | |
| parent | 08d7cdcc11eed08c30adf1f118b8d6dd500b7897 [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: 08d7cdcc11 -s ours am skip reason: change_id I567890f3d04544c12adfe29a6a23c06f1db699e7 with SHA1 8c886ae968 is in history Change-Id: I3bc9d4a425d08ad51768c0b8cddc30f5eb8a7a82