commit c984bb10e693c918fcef974c0c30a140357be0fe
author Nate Myren <ntmyren@google.com> Wed Oct 26 02:02:19 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Oct 26 02:02:19 2022 +0000
tree dd8245e6ef17c163cc2c70f1ded998c6707c2197
parent da76bb8b1ff782c206b4bc2ae9ecc1cf66f4c6af
parent 1a1985de7421dc9db9f2b91147b93d684a427f62

[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: 0bccaaedcf -s ours am: e70050c788 -s ours am: e42bde8d66 -s ours am: 1a1985de74 -s ours

am skip reason: subject contains skip directive

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

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