tree ed52f539f667cce3a18880ccac5853ac1f34a5dc
parent c5c995c095c83262ce3da80c374dbb9fc7b42f14
parent b3b43be5d841003b8323bd4ddbda34fa405ad41d
author Xin Li <delphij@google.com> 1567980391 -0700
committer android-build-merger <android-build-merger@google.com> 1567980391 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: b3b43be5d8 -s ours
am skip reason: change_id I8a2c42ff322242f08fd6601536c3f9ee50d0f633 with SHA1 02ea8f4969 is in history

Change-Id: Ied04f35b7ebcb462c22f3fff019953844606415b