Merge "Strip transition information from activityoptions when sent to app" into sc-v2-dev am: eeab60091c am: 5a154b395a am: 85817e6590 am: 9847d708d7 am: 5a93f288fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19518999 Change-Id: I0dbce3748f483851326daec9df68eaa812dfdbf0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: