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