tree 6a2051445cc6646463d9f939b83b86086f3a14ed
parent bcfa39106f4360c8b73b7d84907e4229f73a1333
parent 05ff4e26d9389497ff263e3baac4ab5bd11abe38
author Xin Li <delphij@google.com> 1567981215 -0700
committer android-build-merger <android-build-merger@google.com> 1567981215 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 05ff4e26d9 -s ours
am skip reason: change_id I93faa55bf6fca544876d970d058f8aa5c5462f3c with SHA1 555d150aee is in history

Change-Id: I4c22f3f8aa9ec664b5a3bc100ba98b48032378e5