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