tree 2bb9f3e7858a088a9d7032f56dc19aebcb8ef93a
parent 19842f851df676d5f3771b21c7fe133e682f9343
parent 589cea9c4c90d3b992cbf6133f83c2af2a291a97
author Xin Li <delphij@google.com> 1567979547 -0700
committer android-build-merger <android-build-merger@google.com> 1567979547 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 6e4ebc8b30 -s ours
am: 589cea9c4c -s ours
am skip reason: change_id Id59b59f4e91e6f7e140bd74863345a51d7f8feef with SHA1 d4372873b6 is in history

Change-Id: I6bb6f152c88354ef83c66182714f8195cd7e7ff8