summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-03-20 23:24:34 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-20 23:24:34 +0000
commitd802f6d1353f8a6e5ce9b763c84d7140c0921804 (patch)
treec5dc9195f7479351ef97a702ba8403c37df5d406
parent7338ce29053842d95e83136b53efe43806e5f228 (diff)
parent80cc65f51b2e60b1f533b3dc8c8aa1a7a06ab1c2 (diff)
downloadmedia-d802f6d1353f8a6e5ce9b763c84d7140c0921804.tar.gz
[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: f2b775744b -s ours am: cb01ccf7e5 am: 63ed50eadb am: 80cc65f51b -s ours
am skip reason: subject contains skip directive Change-Id: I775d4e07a414162113d8796a4d6833eba41ecf14
0 files changed, 0 insertions, 0 deletions