Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e am: d16cf0453e am: 07438e359d am: eb7afaa167
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100 Change-Id: Idcae5b9c2174bf781f03108030f88e513fb9555a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: