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