summaryrefslogtreecommitdiff
path: root/libs/androidfw/LocaleDataTables.cpp
diff options
context:
space:
mode:
author Yuri Lin <yurilin@google.com> 2022-12-01 21:01:07 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-01 21:01:07 +0000
commit436f1faa8180fa89d715aff06874450cb579fc66 (patch)
treeb57875885387f71b05ff62655c43ca3dc2baf455 /libs/androidfw/LocaleDataTables.cpp
parent38ef07f03660cbcc808e92273179c3aaa58647e9 (diff)
parent68236776c3f470d8829219302ccbd65d6bd932c1 (diff)
[automerger skipped] Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into rvc-dev am: 177cff5975 -s ours am: b44e95c6a0 -s ours am: 4c144d569e -s ours am: 64c4cbbcb7 -s ours am: 55f0d8adf1 -s ours am: 2e55c7c46f -s ours am: 4ced543a5d -s ours am: 68236776c3 -s ours
am skip reason: Merged-In I0c4c705cfe5fc875151958957daaf8657fbc21a7 with SHA-1 b5ec639ba2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20527082 Change-Id: I5f7190c31ef0c78e066466b8c1942106e926e3bf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/LocaleDataTables.cpp')
0 files changed, 0 insertions, 0 deletions