tree 38fb22b5e764d044e41157f19c94e62f23566d54
parent 45a1d0f62dc1c4c07433a726d6ce54da1943016a
parent 74f7f81de0ba2d4e9cf995397cb054a5109257fa
author Xin Li <delphij@google.com> 1567980339 -0700
committer android-build-merger <android-build-merger@google.com> 1567980339 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 74f7f81de0 -s ours
am skip reason: change_id Iee54a2d226deff786a190480b6ca1d6f7424992c with SHA1 091e3281db is in history

Change-Id: I5493c17680df3dcc4aff5f426644859cae8106a6