tree fd845444b59dfc72656b7781596e0b1a0662c4c7
parent b26585aa0393dba77240939d6de97916b1a47934
parent 3ec3e42074fb9f1dbf874070b5fde6b43e971794
author Xin Li <delphij@google.com> 1567985769 -0700
committer android-build-merger <android-build-merger@google.com> 1567985769 -0700

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

Change-Id: I1d28b9a7ed52a28309afa14dc5be11dfbca63b55