diff options
| author | 2022-08-04 04:47:11 +0000 | |
|---|---|---|
| committer | 2022-08-04 04:47:11 +0000 | |
| commit | 9a861ea283811fcf774bb07b7c23cd1deb521cc0 (patch) | |
| tree | e32cd3bb6de1b6c6afec2d1813b212cd499e27cd /libs/androidfw/StringPool.cpp | |
| parent | bebd000a51b420170c13c86e9809928762182117 (diff) | |
| parent | 68fcf465e5655eb9e510f5989d15b14d746d8b2a (diff) | |
Merge "Merge "Revert "Strip transition information from activityoptions once it is read."" into sc-v2-dev am: 1099b25b2d am: d7ae033815 am: 2e763d31d2" into tm-d1-dev-plus-aosp am: 045b0a8df6 am: 68fcf465e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19517194
Change-Id: Ica4fbffda0f51b3899a149c17f398a8620cc0a16
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