diff options
| author | 2022-08-04 04:18:30 +0000 | |
|---|---|---|
| committer | 2022-08-04 04:18:30 +0000 | |
| commit | 4c78e5c98e66258ddf975055336a96a2aefd9210 (patch) | |
| tree | e42975371001bf83ca9ffd46b53085503fa7f9cd /libs/androidfw/ResourceTimer.cpp | |
| parent | 6ac6ce936538af8c284b04b889f10a2256532e9e (diff) | |
| parent | 2e763d31d225dbc0b56e3bfb0e5d3b47a4dfb54d (diff) | |
Merge "Revert "Strip transition information from activityoptions once it is read."" into sc-v2-dev am: 1099b25b2d am: d7ae033815 am: 2e763d31d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19517194
Change-Id: If8f1ab91e07e72b49859593c77471f54d399a367
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions