tree b4407ed312afb164b4febf140865990ee25ae37b
parent 2aae60dbcddc9c02382a11c1bd34cbcbeb609a97
parent 36ccae5f902647becbf40d62e264533c3356e748
author Xin Li <delphij@google.com> 1568235966 -0700
committer android-build-merger <android-build-merger@google.com> 1568235966 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 36ccae5f90 -s ours
am skip reason: change_id Icc751a05abba7c0dff8c9f8cabb5ca5d0c0baeef with SHA1 fa91357ae2 is in history

Change-Id: If13d7167acf14bac114084e5037743d90dbdb777