tree 827b987130094e9e701ed9915aa9ed62c85070c9
parent dce53bbe7521d02b5eb34160aa87eebd8022f8e1
parent 325defefade39d3e5aa9f8f8af68147ad32c073a
author Xin Li <delphij@google.com> 1567982882 -0700
committer android-build-merger <android-build-merger@google.com> 1567982882 -0700

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

Change-Id: I8e91bdc44a98d85f569e2dd3e510befd6a42c70c