tree 24c060c06c43bbd1641c8d2aaf996f05504f7dd5
parent eb03cc83152216f3693518d44b331fa53bbb2e4c
parent 1f86a83b46274c1f0b916e66d13f6925dec5447a
author Xin Li <delphij@google.com> 1566851446 -0700
committer android-build-merger <android-build-merger@google.com> 1566851446 -0700

[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.020 into stage-aosp-master am: f5defc19a0 -s ours
am: 1f86a83b46

Change-Id: I2768c093197686bcdb7b5e55f6f6a92a53d501ab