tree c59b7d18b0f5c5194a8e2d5ff24920f8c278f238
parent 93d7fbb2fa2057f7758e68d6988fe76c5f306099
parent fdb57148be75def2fd8993d59addfc68c669c28d
author Xin Li <delphij@google.com> 1567985278 -0700
committer android-build-merger <android-build-merger@google.com> 1567985278 -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: fdb57148be -s ours
am skip reason: change_id I5deecae030bca06bb7abfa7d7714cfbe3e0c6a78 with SHA1 62a707871e is in history

Change-Id: I301263d40956580c4c7b445921518f1bf2a98252