tree 7b7c552b2a77e7f95d8e85df58e28bd3e83d4e7b
parent bf6d51a4ef57b08ff26533ccc127068adad9bd3b
parent 4178a73f0d1097f1cd6291831360fa22da54aa36
author Bill Yi <byi@google.com> 1543605754 -0800
committer android-build-merger <android-build-merger@google.com> 1543605754 -0800

Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release
am: 4178a73f0d

Change-Id: I3aff5ea4bcfc5da7eb56a89fea74691773760bc3