commit | 6a44236d297379b37dd75214c4fd7e6ab6adbc67 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 03:33:20 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:33:20 2020 +0000 |
tree | c24789830230557c3d8098501a0941cc5fe9e69d | |
parent | 5d2b9a4c10ae07d85599de6e1ca565e08944fb09 [diff] | |
parent | c0d20a5f9e1d12339f0323d60d38931118462a5a [diff] |
[automerger skipped] Merge Android R am: e76a9db32d -s ours am: 9179242d68 -s ours am: c0d20a5f9e -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: I476e5b1adbbb791667a13b0b26bae913581f4bc4