tree 64986255cbca77d1a62642837ddfe492aff7898d
parent 85be799d1308c0208e0c413d0363d6b43af7f6f8
parent 4fe1809bc16e7eb29a4a43988302c652b683a59a
author Xin Li <delphij@google.com> 1568241625 -0700
committer android-build-merger <android-build-merger@google.com> 1568241625 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 087bf32be2 -s ours am: 366954c3d9 -s ours
am: 4fe1809bc1 -s ours
am skip reason: change_id I20eda906f06b84b148b1b94439e8092d65ea6b4c with SHA1 5c35f40326 is in history

Change-Id: Iec3af50c2de2356e0e406b74c884ffbabce39166