summaryrefslogtreecommitdiff
path: root/libs/androidfw/LocaleDataTables.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-10-27 20:44:21 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-27 20:44:21 +0000
commitb87dec370b3e28cb19cec4af304a354a8eea822c (patch)
tree255db0dce0f0c401fe6a86d14120119739df6dea /libs/androidfw/LocaleDataTables.cpp
parentc711a225363f229c7c80da74106fa37ed437f41f (diff)
parent2d162e19ddb0f282446c8ee0dbae095f90ad0931 (diff)
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" into rvc-dev am: 8038ab1477 am: e8f11f8960 -s ours am: 911725a3ee -s ours am: e3a5eed1d8 -s ours am: 9810b6ef91 -s ours am: fa32a51868 -s ours am: 2d162e19dd -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20235229 Change-Id: I576fdf5ee69ef5b9f3be8bffca3f6f2af0b3bcc7 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