| commit | ac61bb0233ed642d54f904df14fdfd8b853550f3 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 03:58:51 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:58:51 2020 +0000 |
| tree | c24789830230557c3d8098501a0941cc5fe9e69d | |
| parent | 51972c590bf3f84c2761a423051f772da98ad873 [diff] | |
| parent | 6a44236d297379b37dd75214c4fd7e6ab6adbc67 [diff] |
[automerger skipped] Merge Android R am: e76a9db32d -s ours am: 9179242d68 -s ours am: c0d20a5f9e -s ours am: 6a44236d29 -s ours am skip reason: Change-Id I32a7ca28f66d8350a9a1bebe88d5aa7481a4ce0b with SHA-1 2a153ae758 is in history Original change: https://android-review.googlesource.com/c/platform/external/libmpeg2/+/1422376 Change-Id: I914c0c0d5cc6f202f86e67e756816c46adde4e50