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