summaryrefslogtreecommitdiff
path: root/libs/androidfw/ConfigDescription.cpp
diff options
context:
space:
mode:
author Nate Myren <ntmyren@google.com> 2022-10-26 02:23:30 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-26 02:23:30 +0000
commitfdc60a08ef4673dc84735bb4f408ba6c751bdffb (patch)
tree1f6ddc47c3df11285890d2a1e68b41901551ece7 /libs/androidfw/ConfigDescription.cpp
parent67fdf9e72337894812573d9b365bc3e6ebd05883 (diff)
parentc984bb10e693c918fcef974c0c30a140357be0fe (diff)
[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: c984bb10e6 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20103164 Change-Id: I1fe1587d5ba1d7309072fe9f8f14138ca9be906a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ConfigDescription.cpp')
0 files changed, 0 insertions, 0 deletions