tree 79e4776a9607c86800586aa8ce3be25e52c03dd7
parent 34c2839d3cf13e57071032828271af888ba0ac08
parent 7cb144249f8d9284a3766c49e573fb0d52798abf
author Evan Rosky <erosky@google.com> 1659488986 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1659488986 +0000

Merge "Strip transition information from activityoptions once it is read." into sc-v2-dev am: dc8ae7665a am: a824844cdf am: 7cb144249f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19505172

Change-Id: Ibded759578f05fe3dab6af5f0dc0e8579756e46d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>