summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-04-08 07:24:03 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-08 07:24:03 +0000
commit9a02de9df2e5cb96a74ef39278288586d6988ac5 (patch)
treed4bf8d35e88b6bcf8ad129c05da0aaf4476bb744
parent5d237288a9255141a3edb5d53c7a99ef57db6ad1 (diff)
parentc9828618df50ee0f200a8d577cac0e2aa5f366dd (diff)
downloadmedia-9a02de9df2e5cb96a74ef39278288586d6988ac5.tar.gz
[automerger skipped] DO NOT MERGE - Merge QQ2A.200405.005 into master am: 9d48fd3b30 -s ours am: 8c9a92e1b3 -s ours am: 6772b332ed -s ours am: 23103e7c15 -s ours am: c9828618df -s ours
am skip reason: subject contains skip directive Change-Id: I7d59007e49ba84a0e431e3f3b40a7a7fb023e99c
0 files changed, 0 insertions, 0 deletions