summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-04-08 06:30:50 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-08 06:30:50 +0000
commit8c9a92e1b3f39790ac1de060efb6b991101b9e93 (patch)
treec5dc9195f7479351ef97a702ba8403c37df5d406
parentf2b775744b7202d1d315e1eba715731eaf00a872 (diff)
parent9d48fd3b30a6fda147094c9eb960207b659cf21f (diff)
downloadmedia-8c9a92e1b3f39790ac1de060efb6b991101b9e93.tar.gz
[automerger skipped] DO NOT MERGE - Merge QQ2A.200405.005 into master am: 9d48fd3b30 -s ours
am skip reason: Change-Id Ica54841cbc81b29c4b3bfa0b58f94a0f82de300b with SHA-1 4c2000cb4e is in history Change-Id: I641f7e034fb1579dc348571ce67582f3d98e16bf
0 files changed, 0 insertions, 0 deletions