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