tree e8cb6195d9d09b425c8a7c6ca787fcd434236561
parent 98199fce297eae6605e463adeb62f60b9d91cb29
parent 4a6bc2915ec72882fa7e1cffaa97fdbc3e718df2
author Chris Sabotta <crsabotta@google.com> 1666770919 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1666770919 +0000

[automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Validate permission tree size on perm..."" into qt-dev am: f661f5e669 am: c17c5cb249 -s ours am: fecdde0e57 -s ours am: e370885445 -s ours am: 3051c06d1f -s ours am: aeea17a928 -s ours am: fdb029611f -s ours am: ad7ddf16bf -s ours am: 6f9e43d0af -s ours am: a76128c534 -s ours am: 4a6bc2915e -s ours

am skip reason: subject contains skip directive

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

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