diff options
| author | 2022-08-04 03:52:10 +0000 | |
|---|---|---|
| committer | 2022-08-04 03:52:10 +0000 | |
| commit | 1a840382302b4a79b14608045f6d0e9ff16a1ad4 (patch) | |
| tree | 4e83bbfdb53e1f48cbf747c5c1fb69ade67c58f2 /libs/androidfw/StringPool.cpp | |
| parent | 6642aecb2891a5f5fa86e4cad82098641f9b5f02 (diff) | |
| parent | d7ae033815ca79fe213eed937df13690785975ab (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: I5ac015feb37a0f61a104630ecd9ec3bb8585a1ff
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