tree 3e4059b0fcf350b58a95cb23e1d4adda48064468
parent 7e9b708f6783f65c7ee74d1b37dcff67cdffbe07
parent adccb8feda99f535c895456dab16c4201faf3b05
author Xin Li <delphij@google.com> 1567979358 -0700
committer android-build-merger <android-build-merger@google.com> 1567979358 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 3162e8aa61 -s ours
am: adccb8feda -s ours
am skip reason: change_id I2f97c75036ec82748707c78058b9818ea42ae893 with SHA1 1e017ab7c3 is in history

Change-Id: Id131a237fabb2c1f37bd069190f7e2b7b3036ce1