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