diff options
| author | 2022-08-04 04:46:31 +0000 | |
|---|---|---|
| committer | 2022-08-04 04:46:31 +0000 | |
| commit | bebd000a51b420170c13c86e9809928762182117 (patch) | |
| tree | e32cd3bb6de1b6c6afec2d1813b212cd499e27cd /libs/androidfw/StringPool.cpp | |
| parent | 37d33a273de3f43931d624434bea658cb787c38f (diff) | |
| parent | 50d18bffa6e5f0dde8cf9ac273ede4414d2e5842 (diff) | |
Merge "Revert "Strip transition information from activityoptions once it is read."" into sc-v2-dev am: 1099b25b2d am: d7ae033815 am: 1a84038230 am: 8dd7dcc99c am: 50d18bffa6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19517194
Change-Id: I6dea8018e8b43597c7984899b0a3bf9ddb52178d
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