tree 202f22b06b90bff2fc9dd36abff5017cb012cbbe
parent be5f6ec17a7c8e7a639f3d81abd73708d23d4053
parent 797130710462cc3301ddc9c577b2b6be2eacf8b5
author Xin Li <delphij@google.com> 1567979469 -0700
committer android-build-merger <android-build-merger@google.com> 1567979469 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: a2d09fb45f -s ours
am: 7971307104 -s ours
am skip reason: change_id Id46d6370b1569ed342f5e31e36c98fa78f256c9a with SHA1 b511c7d025 is in history

Change-Id: If356ca0345bb2a39f6db2c44a66babe007ec9109