summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Evan Rosky <erosky@google.com> 2022-08-03 00:17:02 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-03 00:17:02 +0000
commitb681ae52cf59e2617888685125fda445b3771397 (patch)
treeb0001e8880ab13e0640e2dbe477adca73f16061c /libs/androidfw/StringPool.cpp
parent5f094ab84a6a51b906f4dfc13fd02b5a97a89917 (diff)
parenta824844cdf94511d826d392ba7400b4da8fbe686 (diff)
Merge "Strip transition information from activityoptions once it is read." into sc-v2-dev am: dc8ae7665a am: a824844cdf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19505172 Change-Id: I42c7f55d2f2b38ed46f3024e590b3d8728458722 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