| commit | a2db7f8216b73ae3c94432d2382886f00f514f10 | [log] [tgz] |
|---|---|---|
| author | Wonsik Kim <wonsik@google.com> | Tue Nov 05 14:07:32 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Nov 05 14:07:32 2019 -0800 |
| tree | a4f6d84906220be15767337d7597f26513f098ce | |
| parent | c999a1d8da606d627af737c039f01391bb40cec2 [diff] | |
| parent | 2c5768e6b7596c70c1e0a05df0e3df4dcba012c5 [diff] |
[automerger skipped] Merge "aacenc: handle and warn overlapping timestamps" into qt-aml-media-dev am: 4358fd9a69 am: 2c5768e6b7 -s ours am skip reason: change_id I09c679330e6c3fdf7329a1723b5e31cbd1c7e65b with SHA1 227480430b is in history Change-Id: I6aac11a0996ff3a7e0032fd82c4c4500d0c0c22b