tree fd845444b59dfc72656b7781596e0b1a0662c4c7
parent cc12a61f80c9ca7f07f97dd80f5335ed849beb10
parent afc87d309e00c36a60c11047d96b45e05e9ebce0
author Xin Li <delphij@google.com> 1567982945 -0700
committer android-build-merger <android-build-merger@google.com> 1567982945 -0700

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

Change-Id: I89aeb717d28b63ce9da3528bc332cf870d925625