summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Terry Wang <tytytyww@google.com> 2021-10-13 21:25:39 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-10-13 21:25:39 +0000
commit569cbb8d4e502a58ad8d2353b5cd5c025fcede34 (patch)
tree13cfe8e851113a39d145b631f48d3b370c7f56ec /libs/androidfw/StringPool.cpp
parent1dcb8e8763378b995253b7172efcecfe3203507a (diff)
parent4da674b5177e6df9ea0db8d61e95957010660b9c (diff)
[automerger skipped] Merge "DO NOT MERGE: Revert "Enable cross-user requests."" into sc-v2-dev am: 4da674b517 -s ours
am skip reason: Merged-In I38469ad5df100e90aba81bbdc82078b568301f09 with SHA-1 0b488bfdb2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15927319 Change-Id: I6d53dbe5d7e860b4f4551f22bbcac099abb8fdea
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions