tree 11ae1d7ff7f7cf4c84345d3d8df9073714f65f0c
parent 265db5ea97d110e86a9f5fac4d166056f52a6287
parent e7981ace7160797adab287cc665fc4d6e421673e
author Xin Li <delphij@google.com> 1567980283 -0700
committer android-build-merger <android-build-merger@google.com> 1567980283 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: e7981ace71 -s ours
am skip reason: change_id I2db8e54c89620d3d8697139dbcf33c56226474b4 with SHA1 03efb2357a is in history

Change-Id: I88d92b2cefe5756a8abc88ddd9243779215b8168