summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-09-11 15:39:45 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-11 15:39:45 -0700
commitd814dfab1d4e90b8a5fcbe8c7d00184b1c05a9e3 (patch)
tree1570144522be0103db9e0da6a21e2c1a0728ea80
parentbcc1844094d9c402b0c3685dc8a4bd4655d08f53 (diff)
parent2055139148ca28e36141dfb798143892a592df30 (diff)
downloadsetupcompat-d814dfab1d4e90b8a5fcbe8c7d00184b1c05a9e3.tar.gz
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: a49538feaa -s ours am: 6281920563 -s ours
am: 2055139148 -s ours am skip reason: change_id Iba2b0e6a1bff477aed2f1bbd9b599bbcf2eea942 with SHA1 b1f825f052 is in history Change-Id: I2b51522bbae32d5173f7d864020601e0df7aa952
0 files changed, 0 insertions, 0 deletions