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