tree adaca4ad2145de81e19efa54708940741196859d
parent c86237ceb43efea0d376924b48765b8540c2e1f2
parent dd38706da725781ed54b1ae18dc7b5ad2979f436
author yuemingw <yuemingw@google.com> 1537210067 -0700
committer android-build-merger <android-build-merger@google.com> 1537210067 -0700

Merge "Fix managed user policy transparency test crash." into pie-cts-dev
am: dd38706da7

Change-Id: I64923244f991f43f333377734df61b56a3cdf5b9