commit | c0d20a5f9e1d12339f0323d60d38931118462a5a | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 02:02:29 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 02:02:29 2020 +0000 |
tree | c24789830230557c3d8098501a0941cc5fe9e69d | |
parent | 83a0d003494fc2d322d033236c4d829eaea17034 [diff] | |
parent | 9179242d68e0ad571e718ea7f25fe584c11830b8 [diff] |
[automerger skipped] Merge Android R am: e76a9db32d -s ours am: 9179242d68 -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: I41ef6a5e1ed29e6c056c5473f146f211cc699504