summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Evan Rosky <erosky@google.com> 2022-08-04 05:22:56 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-04 05:22:56 +0000
commitf5634815f049d5dc529871dd7f95e0b9c26dcdba (patch)
tree3433c8c8be49a4189eac51990f93f18ff15eb264 /libs/androidfw/StringPool.cpp
parent6d57dc37a444b681b2e4511cf8f01fc6e693cb37 (diff)
parent5a154b395a3f67fecfbffa9b85d2f760a49546f9 (diff)
Merge "Strip transition information from activityoptions when sent to app" into sc-v2-dev am: eeab60091c am: 5a154b395a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19518999 Change-Id: I0ddd172636619297b413e6b6a276ed2d74cdf48b 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