tree a1a984e8c94750699cbb0931b59a6d5890a947f8
parent d3980d0ce572d3e78e123d48b3287c6af63a79ea
parent f522dd14c9e38e9183531148171f962213402077
author Xin Li <delphij@google.com> 1567979444 -0700
committer android-build-merger <android-build-merger@google.com> 1567979444 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 3826203ca6 -s ours
am: f522dd14c9 -s ours
am skip reason: change_id I5f3596d149f2f4319f780b43f38a1967a6ca2f51 with SHA1 2e4ef0bce9 is in history

Change-Id: I83711bb837b18438e42d6f76986a9a6d8772b4a5