tree 6d3beb31d8dfba2caca8de9e2bffb00375318172
parent e666aa1e3d43b29fec85860a6b8c3556cab9aa20
parent df86206d8273769b7b061f0d9b9e381128d87132
author James Mattis <jmattis@google.com> 1604553873 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604553873 +0000

Merge "Adding @IgnoreUpTo for testOemPrivate" am: df86206d82

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487452

Change-Id: I92bd7437dede4ae4a4bb27dfbf68a5ae74553811