tree 827b987130094e9e701ed9915aa9ed62c85070c9
parent 552d54fcec3445a5d32e503138d479bfffb57b40
parent 0b42bda9acf30734ded19dabde5b11c3a675b5c2
author Xin Li <delphij@google.com> 1567980333 -0700
committer android-build-merger <android-build-merger@google.com> 1567980333 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 0b42bda9ac -s ours
am skip reason: change_id I48461c06d1ed34045ef251b647cf193c602b4780 with SHA1 df7e1b6c4c is in history

Change-Id: I1c4bcfaa5d931527e8fafee9202bf3378baedca1