tree cd524d1c44ed5ba56e86e6ff9a0fbf7505cc0160
parent c18bb93182fb5b43c107ea9789aaec42391e3973
parent 3d6bb4841a17c231534eae73cdc8d2fb72568cd4
author Xin Li <delphij@google.com> 1568235414 -0700
committer android-build-merger <android-build-merger@google.com> 1568235414 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 3d6bb4841a -s ours
am skip reason: change_id If650b6aec14985233054bd9017b1e84608b574d5 with SHA1 d7e0bad295 is in history

Change-Id: Ic1dfe940d17436e2bdfdf77ee0f361477ff50fa6