aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-09-08 15:11:45 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-08 15:11:45 -0700
commitbd032964e6f8052b68e85313047f7dea970f9f92 (patch)
treea1a984e8c94750699cbb0931b59a6d5890a947f8
parentdccbf1bc853530efbee36962667a457b8e4038c4 (diff)
parent481ccb8c0b4b2e1aec1f7e3674358091766797e4 (diff)
downloadjdiff-bd032964e6f8052b68e85313047f7dea970f9f92.tar.gz
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 3826203ca6 -s ours am: f522dd14c9 -s ours
am: 481ccb8c0b -s ours am skip reason: change_id I5f3596d149f2f4319f780b43f38a1967a6ca2f51 with SHA1 2e4ef0bce9 is in history Change-Id: I830289632cfbec319a22f269eab07b7a860a4e8d
0 files changed, 0 insertions, 0 deletions