tree b62fa93b4e797bc596b75eecd14be4a72c73edfd
parent 550bb4af1967aea752fc6c43bea6a6a6bdd3b9c5
parent f7a63940445223a51bd6a72f84ffd052c0d1ec23
author Xin Li <delphij@google.com> 1567979325 -0700
committer android-build-merger <android-build-merger@google.com> 1567979325 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 568bd269d4 -s ours
am: f7a6394044 -s ours
am skip reason: change_id Ie7c7af1927cfb1178b491c32fc6f7d0bb8005f7a with SHA1 66de894915 is in history

Change-Id: I5b49a02ccce99e2bc3a01c903dd80382dd358550