Merge "Strip transition information from activityoptions once it is read." into sc-v2-dev am: dc8ae7665a am: a824844cdf am: 7cb144249f am: fc301ed47c am: 0bd65b828d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19505172 Change-Id: I83dd3fa96e34a8b22d217197c94e9e13205fcdaf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: