summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-11-01 07:54:09 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-01 07:54:09 +0000
commita0951b0cb93330d795ad64f3a174e98e3f4248a5 (patch)
treef000ad26c9560fc7b4fec85df69cd250e90cda74 /libs/androidfw/AssetsProvider.cpp
parent4728d891f5efb63fbfe39dd84428d1994bde5bf1 (diff)
parent13004e6151423cbfabc4411705b58cd74221581d (diff)
[automerger skipped] Merge "Enable user graularity for lockdown mode" into sc-dev am: 595f1caaea -s ours am: 57f01ddb22 -s ours am: 5fc5d1e14e -s ours am: 66ae67ff4e -s ours am: 13004e6151 -s ours
am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 9281fb98e3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20191680 Change-Id: I2499ba3d2668a7ea05e272b3d89f2a18d67acc38 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions