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