tree a594b54dab5d16b84aee9f218b860d29c20e5ccd
parent 6efbb8c655989863161f2152e4b142c3e3040f55
parent 2e68486822709fc693548f78d8b5fc14883afd89
author Jackal Guo <jackalguo@google.com> 1641954229 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641954229 +0000

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix the inconsistency of protection level" into rvc-dev am: c9fc96e7b4 am: ccb1fef85d -s ours am: 2e68486822 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I670477e7ff78cf73aff0fe396afa5094a948d3ab