tree 46b2bce636a4cb7fb5747847fed40eefccba5169
parent cc92930e29389b550f1b8df72e76abf743e2ba28
parent b7fab0094c3280d747c6c252b1b3db859956e24f
author Xin Li <delphij@google.com> 1568235249 -0700
committer android-build-merger <android-build-merger@google.com> 1568235249 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: b7fab0094c -s ours
am skip reason: change_id I4d60d2ad06007842be6af1f2ab844917f18cc629 with SHA1 55329386a3 is in history

Change-Id: I7ca35263e49c8736ecb056d097b11c137e2cdcde