tree c59b7d18b0f5c5194a8e2d5ff24920f8c278f238
parent 299ccf5b59f7d1f64c771b12ebf9e0e41e102c70
parent 31a5d9f7d54d26126d70c1d0f677a5eca6fafc94
author Xin Li <delphij@google.com> 1567983578 -0700
committer android-build-merger <android-build-merger@google.com> 1567983578 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 8e99b15b1a -s ours
am: 31a5d9f7d5 -s ours
am skip reason: change_id I5deecae030bca06bb7abfa7d7714cfbe3e0c6a78 with SHA1 62a707871e is in history

Change-Id: Id70e6a1c5dbae3ebc158c50e4ef753fa1b7e9d33