tree f2ee538e31e0e0599cbfd64ea44f4d312712d05b
parent aecb3b82274951fc8c63b0c4f669fc2ea02a5976
parent 9f7476ad4cee5d280c0afd9004dfd8418c2bf816
author Xin Li <delphij@google.com> 1567981222 -0700
committer android-build-merger <android-build-merger@google.com> 1567981222 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 9f7476ad4c -s ours
am skip reason: change_id Ib11313bef8f129e109d11e656b29c9b753137265 with SHA1 25353557c1 is in history

Change-Id: I7eed80e417dbce9c3890c8781684cab6d5ac6b88