summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Iván Budnik <ivanbuper@google.com> 2022-09-09 18:56:00 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-09 18:56:00 +0000
commit8dba96b3974364ff78d9a8e0b2c3a0e8615860e8 (patch)
treecac335f36318cd32ade8f8e338d2982d2bd0da26 /libs/androidfw/StringPool.cpp
parent9550618ce070c047807290f5a90ceb078a8d5023 (diff)
parent4d54528b59f43585e4dd44bf8e1af1ce1d59fb05 (diff)
[automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into sc-dev am: c59352ed18 -s ours am: 53f19e615b -s ours am: 8ae2b04df7 -s ours am: f3eb39a184 -s ours am: 4d54528b59 -s ours
am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 ff7be9912f is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19773959 Change-Id: I4cdc2a09b2a6ae2dd626c1c9374d6f3829ddade9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions