tree d4d0f1ccfa3d6b82ef0a0be0a353328a3001714d
parent 5d7bf4dce568d1fa6863fdf10eeeeb7d1f265825
parent 1b0652832501f3effcf3b51249b7e48163b6a084
author Xin Li <delphij@google.com> 1567984900 -0700
committer android-build-merger <android-build-merger@google.com> 1567984900 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 260cab7892 -s ours
am: 1b06528325 -s ours
am skip reason: change_id I38429ee13989d447b1350d9f098d22786c2e9447 with SHA1 3343873fa1 is in history

Change-Id: Ieac914597192851fafec2ef3fa3b009bd1f23877