tree 2394bd5abc0bd7aad1d748f25218e4b8c8ecf769
parent 91108d41247ee916a45aa0998e22bf572f471457
parent 4ec16abf8297115857a8b09db4345370b29107c7
author Xin Li <delphij@google.com> 1567983989 -0700
committer android-build-merger <android-build-merger@google.com> 1567983989 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: b3b43be5d8 -s ours am: 4b1e751181 -s ours
am: 4ec16abf82 -s ours
am skip reason: change_id I8a2c42ff322242f08fd6601536c3f9ee50d0f633 with SHA1 02ea8f4969 is in history

Change-Id: I10f3a47376ab5129ec759278e40a344519f0f97a