summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Evan Rosky <erosky@google.com> 2022-08-04 04:19:40 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-04 04:19:40 +0000
commitaa569948534015abb01317da40f3a5ef3f88e3c6 (patch)
tree4f7e40854fd36dec0441feca72441c3f035fd780 /libs/androidfw/StringPool.cpp
parent5191b83914280d1e3359dfabda6c83b171bb9d2a (diff)
parent4c78e5c98e66258ddf975055336a96a2aefd9210 (diff)
Merge "Revert "Strip transition information from activityoptions once it is read."" into sc-v2-dev am: 1099b25b2d am: d7ae033815 am: 2e763d31d2 am: 4c78e5c98e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19517194 Change-Id: I4d0f747f5513fc57cf6d8ff0d9fa480680183af4 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