tree 371ca3b29310a2c885a9425ed22788c9a6f33282
parent 85568e1575deb87d7c0dea4bf6c88d1983e9c0e6
parent 6a75682e466d6f80edc3318955d64aad30532c07
author Kelly Rossmoyer <krossmo@google.com> 1557446993 -0700
committer Kelly Rossmoyer <krossmo@google.com> 1557446993 -0700

Merge branch 'android-msm-bluecross-4.9-pi-qpr2' into android-msm-bluecross-4.9-pi-qpr3

JULY 2019.4

Bug: 131239907
Change-Id: I3d3548c777b2dbff4703601aae083f0c1bc82f4f
Signed-off-by: Kelly Rossmoyer <krossmo@google.com>