summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-09-08 15:21:51 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-08 15:21:51 -0700
commit5bb4635e10829d8093f861f590d795dfc1214b22 (patch)
tree53c36ced8fa3e3ee3d6995dc6072a226815ea23d
parent61c1097893c66d3988de001424d1e4342acbe300 (diff)
parentdd93130ef84687ac7366f394732b5a5b56d5941d (diff)
downloadchips-5bb4635e10829d8093f861f590d795dfc1214b22.tar.gz
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: dd93130ef8 -s ours am skip reason: change_id I9be32d660ea88584abd595e9e11d18d00b0b6a1d with SHA1 18f02edec8 is in history Change-Id: I051750e523207b7e21b75c3cfa660dbaac30041a
0 files changed, 0 insertions, 0 deletions