tree c5ad7e6a0f57596e174b2df0f657a16e82d81d44
parent 44ca17dfb85db362d1119f46f6af9ff8dd85d799
parent d06d573eb3a32ed8d151d0f42137e994f6ed9806
author Xin Li <delphij@google.com> 1566617764 -0700
committer android-build-merger <android-build-merger@google.com> 1566617764 -0700

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

Change-Id: I40b63adf7818356de777471e021aaec6bd2501ca