tree 09a382c89d58ac170687b86f24f3ebc3f80698b6
parent fb336e9956503c6aa9f600f738e7359323613939
parent c26793c451e6d39592f8c7de2a8e0d99736e2221
author Xin Li <delphij@google.com> 1568235934 -0700
committer android-build-merger <android-build-merger@google.com> 1568235934 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: c26793c451 -s ours
am skip reason: change_id I5d1305694de7dd89a12b59c61507fcaa7cb41d6a with SHA1 465ba7cca5 is in history

Change-Id: Ib5f58dcbf26dfb65880a16400ee07fe15b39ae57