| commit | 7f1ac59d0c25805bb57c37652750f1a558e95fde | [log] [tgz] |
|---|---|---|
| author | Akshay Thakker <aksh@google.com> | Mon Aug 12 14:31:39 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 12 14:31:39 2019 -0700 |
| tree | 64246320ef987627a9b0f7dd164e9cc649549ab2 | |
| parent | e82542844f05a7bbb2f99a332af10af596940725 [diff] | |
| parent | d2ba95c3afdffa01397debe14eb8e6672dbe939f [diff] |
[automerger skipped] Merge "Revert "aacenc: fix timestamp off by one frame"" into qt-dev am: b2f9f22cfa -s ours am: e171c1eb51 -s ours am: 328d9520f7 -s ours am: d2ba95c3af -s ours am skip reason: change_id I567890f3d04544c12adfe29a6a23c06f1db699e7 with SHA1 8c886ae968 is in history Change-Id: I4d48491e1fb6f4971ce16bdab55fac9c4713737f