tree 09a382c89d58ac170687b86f24f3ebc3f80698b6
parent 9c8f60bf44bd964454b924d81b228af7947f13c0
parent a0ab48b335ee30276c6a182f0f4e0fc03f9af7ee
author Xin Li <delphij@google.com> 1568238789 -0700
committer android-build-merger <android-build-merger@google.com> 1568238789 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: c26793c451 -s ours
am: a0ab48b335 -s ours
am skip reason: change_id I5d1305694de7dd89a12b59c61507fcaa7cb41d6a with SHA1 465ba7cca5 is in history

Change-Id: Ibb42bf27b2592922afe148ceb238d86792db50e1