summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-09-08 15:32:06 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-08 15:32:06 -0700
commit1b0652832501f3effcf3b51249b7e48163b6a084 (patch)
treed4d0f1ccfa3d6b82ef0a0be0a353328a3001714d
parent2cdd50295e07d1cd56814bb82f300bfee7ec19ae (diff)
parent260cab78920046d309d8b05023115a6aed9c0d20 (diff)
downloadsetupwizard-1b0652832501f3effcf3b51249b7e48163b6a084.tar.gz
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 260cab7892 -s ours am skip reason: change_id I38429ee13989d447b1350d9f098d22786c2e9447 with SHA1 3343873fa1 is in history Change-Id: Ied17a74ac75304af1e2f6fd0bb804293789e3cec
0 files changed, 0 insertions, 0 deletions