diff options
| author | 2022-08-04 04:17:31 +0000 | |
|---|---|---|
| committer | 2022-08-04 04:17:31 +0000 | |
| commit | 5dab510cb66f5770cccfb494235d9028a38c6158 (patch) | |
| tree | f7aad4703eb8c3187376121ca3977465b3876e22 /libs/androidfw/StringPool.cpp | |
| parent | 529dd34b81fb12b5a7372ca3b868cc4925d298f4 (diff) | |
| parent | 6d57dc37a444b681b2e4511cf8f01fc6e693cb37 (diff) | |
Merge "Revert "Strip transition information from activityoptions once it is read."" into sc-v2-dev am: 1099b25b2d am: d7ae033815 am: 6d57dc37a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19517194
Change-Id: I1e240dc550444aad9c5a05ab665a7fa932fbb3f3
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