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