commit | 5d2b9a4c10ae07d85599de6e1ca565e08944fb09 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Sep 01 21:46:33 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 01 21:46:33 2020 +0000 |
tree | c24789830230557c3d8098501a0941cc5fe9e69d | |
parent | 1ea1e15a0096d882105021d9cac2cedb69149d3d [diff] | |
parent | 83a0d003494fc2d322d033236c4d829eaea17034 [diff] |
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 2a153ae758 -s ours am: 83a0d00349 -s ours am skip reason: Change-Id I69a69f0bd988eedd220f8aaab9932e871fe8a2c0 with SHA-1 23442489fb is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libmpeg2/+/12470036 Change-Id: I17de5a75dfc15f80c005a2ca36d1ab1c75c0eadc