summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Sinduran Sivarajan <sinduran@google.com> 2025-02-09 22:09:30 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-02-09 22:09:30 -0800
commit39f5aedb36146a154ae36af0bf7f3977d920ea69 (patch)
treea016ea883974bdbe5165c565f46ef67dcf09c1a5 /libs/androidfw/AssetsProvider.cpp
parentdb820f8cdcadf0c244580f6f26e176c91cdb7f35 (diff)
parentd11e66f6637b0caa777fa6f940e2526f9279c031 (diff)
[automerger skipped] Merge "Disable "Developer options" by default for managed profiles." into tm-dev am: 863a3808f4 am: cde50eaa5b -s ours am: 6d9e45d204 -s ours am: d11e66f663 -s ours
am skip reason: Merged-In Ibe6b721f2552d9e72aba0582a2eed4ba87178c7c with SHA-1 3461e84908 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/31566754 Change-Id: Ib9a40cc496dccd7a88db64af2a71a80cd9bff029 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