tree 20aaf9b58883f351fef551c92529452afe5d21d6
parent d113ed3dd7998872dda625146aab7b0d1c9f6e2c
parent 1060177f55382ee4cbaaba8a3c47122aabfaa5a2
author Nate Myren <ntmyren@google.com> 1666741678 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1666741678 +0000

[automerger skipped] Merge "RESTRICT AUTOMERGE Validate permission tree size on permission update" into qt-dev am: 2d9de7b6ef am: 19a62f65cb -s ours am: 18ab349ff5 -s ours am: 5cd1e01215 -s ours am: 3f6e0cb4fe -s ours am: 1060177f55 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I92b56320e7087b2fcc055153dc3602254adffbfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>