tree e6afa9ffb4ce3225cf6d0478c7876c26292e5375
parent a644a97af6745aec55b060950c25ee6d8224aeae
parent 6ec7626a6bd85336198525efa93211f5189ca269
author Xin Li <delphij@google.com> 1567981116 -0700
committer android-build-merger <android-build-merger@google.com> 1567981116 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 6ec7626a6b -s ours
am skip reason: change_id Iec250219138e8c87e80073e51f89be92ff7c4063 with SHA1 2356825d50 is in history

Change-Id: Ibf66b42bc6e9b1e50cc0a8a32bc99b15b456682c