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