tree 22997cbcef2df0bef2c5e5776013664cccba789b
parent f36fefc6a308872c2e63c5ad306ddf864a193991
parent 52717cf3f0514b86209c62ff2821eb514082c4b8
author James Mattis <jmattis@google.com> 1604559086 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604559086 +0000

Merge "Adding @IgnoreUpTo for testOemPrivate" am: df86206d82 am: d4313a6d0f am: 632960f643 am: 52717cf3f0

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

Change-Id: I3f6ba3a835372b423c9edd4c9a986189b1b59039