summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-09-11 21:27:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-11 21:27:20 +0000
commit9033cc61f9566c0f0a302892190a255c5295830f (patch)
treec24789830230557c3d8098501a0941cc5fe9e69d
parentd67fbd48da5e06c5ec79c7ed54966da8fe4dc13d (diff)
parentac61bb0233ed642d54f904df14fdfd8b853550f3 (diff)
downloadlibmpeg2-9033cc61f9566c0f0a302892190a255c5295830f.tar.gz
[automerger skipped] Merge Android R am: e76a9db32d -s ours am: 9179242d68 -s ours am: c0d20a5f9e -s ours am: 6a44236d29 -s ours am: ac61bb0233 -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: Id649412c3675673f768127ed2e3e37cf452c6c35
0 files changed, 0 insertions, 0 deletions