summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Evan Rosky <erosky@google.com> 2022-08-04 05:23:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-04 05:23:58 +0000
commit85817e659053181ca5c9112b5ee8657dbe8fd612 (patch)
tree8706a61e2fc55b0d803144f188bbe331f03ec00a /libs/androidfw/StringPool.cpp
parent2e763d31d225dbc0b56e3bfb0e5d3b47a4dfb54d (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: Id85f7d2eeaf467cc5c77213379fff81b57c4a67f 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