tree 20838573e732fc1a9975807abb26fd6b6bfa1027
parent e70787696bbd8a3a791f066bdee6d35fb6f44e38
parent 9e8820e303dc58ef95d3ec1603799ca2e9e1c055
author Xin Li <delphij@google.com> 1566634425 -0700
committer android-build-merger <android-build-merger@google.com> 1566634425 -0700

[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master
am: 9e8820e303 -s ours
am skip reason: subject contains skip directive

Change-Id: Iac278bcc46982b4291be04c68a0fa6baa28c0f9e