summaryrefslogtreecommitdiff
path: root/libs/androidfw/Locale.cpp
diff options
context:
space:
mode:
author Evan Chen <evanxinchen@google.com> 2023-11-02 19:34:20 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-02 19:34:20 +0000
commitbb52d169c168d7aa442ca6240f4eb443673c729e (patch)
tree7759c716e273605eb6d976cefc8b8cb9faa24bdb /libs/androidfw/Locale.cpp
parentf3cfcea9192569fa11334e2d32af116c2648a1ac (diff)
parent33700dd08a8f6b7be13e2d7a200e7c8f1ade7785 (diff)
[automerger skipped] Merge "Do not allow setting notification access across users." into tm-dev am: 2335fc14da am: 1ea7c1bad5 -s ours am: 6870f16bc9 -s ours am: d5d3a198a3 -s ours am: a5c2b826f2 -s ours am: 33700dd08a -s ours
am skip reason: Merged-In I6c478ebcc1d981faf2d125a4b41909c3b6a30a2a with SHA-1 ee88e15751 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25096532 Change-Id: I839d2c468620e3ec328efddd8fc00c2d196b85c2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/Locale.cpp')
0 files changed, 0 insertions, 0 deletions