summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Sudheer Shanka <sudheersai@google.com> 2021-12-15 00:18:18 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-12-15 00:18:18 +0000
commitd880ce8602db66bd71ae07b6e8ac7b0a1892df53 (patch)
tree49f2df03a4cc33d7d934df4e248cee8e8811afff /libs/androidfw/StringPool.cpp
parent3995a671d1ad752bd292d9a18c4e125e6f053866 (diff)
parentff733363f6884f8ae52922ca316b4fe7a831f827 (diff)
[automerger skipped] Merge "Fix the case where restricted mode allowed reasons are ignored" into sc-v2-dev am: ff733363f6 -s ours
am skip reason: Merged-In I5e616fd1e9a916ad9a367b4391c85c1febbf1f6b with SHA-1 0b4cafdae8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16459268 Change-Id: Ib0ed9fcad86361d85484e85449d5430c05cf2936
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions