tree ff3b557d825f563705913b9caf44b64452356fc1
parent e6f339e5bca6f49394896e112938ab4b902649eb
parent c22db3e73abb40135339a55a9331955c9133a12c
author Xin Li <delphij@google.com> 1568241749 -0700
committer android-build-merger <android-build-merger@google.com> 1568241749 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: d57e959e71 -s ours am: 9b2f502e0a -s ours
am: c22db3e73a -s ours
am skip reason: change_id I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9 with SHA1 ebf0ccf2dc is in history

Change-Id: I712ca737683eb8ecf584fdfbdf0378afce7fa0ca