[automerger skipped] Merge "Revert "DO NOT MERGE: Revert "Make CheckOp return allowed if any..."" into sc-dev am: 5d31eda995 am: 35e534b406 -s ours am: c30fd1fc9f -s ours am: c0ca348c09 -s ours am: 1b4b21972d -s ours am: 0e75210cba -s ours am: 52e436dc52 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19441568 Change-Id: I59ce439f277532b5b8421f08dfbe6a951d87aa5b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: