tree 6a561f5379c73c4eb7ba64915284437755028320
parent ff5b7c5bf0f733d7e6230998248caa7a081bf4d7
parent 53c08c16076765f880e7c1d55572c17d1ef6a29e
author Xin Li <delphij@google.com> 1568225704 -0700
committer android-build-merger <android-build-merger@google.com> 1568225704 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: fbfcdaf2a5 -s ours am: 275b056832 -s ours
am: 53c08c1607 -s ours
am skip reason: change_id I67a7040a90c369abf5a0c3e7cf0e16f351addb99 with SHA1 874516b3a8 is in history

Change-Id: Ia4f9dafb3b3135c6239579adc710d83d558ea5b0