tree 32004465065b431a8ed1c140d25898dee2cee756
parent 2fb9ee030a8b83e3c72877dfbb7f02f1526a3fd1
parent d38204c9c7da5e3da4bd54641ab06aa800471799
author Xin Li <delphij@google.com> 1567980570 -0700
committer android-build-merger <android-build-merger@google.com> 1567980570 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 18b9201c34 -s ours am: dca0437cfb -s ours
am: d38204c9c7 -s ours
am skip reason: change_id Ic655324c52447411209c7ab8c225af31e3f92241 with SHA1 96f07d819b is in history

Change-Id: I7aa1b9f1e84ce5f574cf7483f28d4ea48edcc5a8