tree edb38e1ed760de3031979ef6dcd7a6a77d64c21b
parent 46efcbc751fcfb8a5453383195d41da3f3fd370e
parent 437d7a3e9369b32c669c8451e9410a0278d2140c
author Xin Li <delphij@google.com> 1572470664 -0700
committer android-build-merger <android-build-merger@google.com> 1572470664 -0700

[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 50ab7f8d5b
am: 437d7a3e93 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia4572e22ea41aaf358c94e24f593f6077cd343bc