tree ae6d9997afc2feffdd212b6ad90d2cc0a22465ab
parent bc0b146f3088a40c42a76d40f18f148e317638f8
parent fbfdd19b5534117395df45c6dd855087f0017fe9
author Xin Li <delphij@google.com> 1568243533 -0700
committer android-build-merger <android-build-merger@google.com> 1568243533 -0700

[automerger skipped] Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master am: b63599b947 -s ours
am: fbfdd19b55 -s ours
am skip reason: change_id Ic9648fed01e9ae5bb1331db85a743892b5d13d09 with SHA1 e7bdc40b0c is in history

Change-Id: I13e8bb4b29c73747c3bffcd0f33e66db0aae094b