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