tree 8ed2eb5729267882eea208df9db1b47ed0dddf96
parent 6e3d8bed97a3bc28dc5561cc7b6466bec7249f3a
parent bc7898323c5955e1bae0f09bb14502711e37126b
author Xin Li <delphij@google.com> 1566621554 -0700
committer android-build-merger <android-build-merger@google.com> 1566621554 -0700

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

Change-Id: Ibce509308710e29ac01e64d5a3194460d69eabc1