tree ba68d96cc5e0ea2f2e6bf77afc5f4f69a4ac8fd3
parent 17c0cab2e9ecd453766c9d8f2a6c0ca9d6e05c08
parent 71c2aab87a9c1655b18de9d78cda7096ef25536b
author George Mount <mount@google.com> 1483567979 +0000
committer android-build-merger <android-build-merger@google.com> 1483567979 +0000

Fix NPE when a shared element doesn't have a matching transitionName. am: f85e2a6833
am: 71c2aab87a  -s ours

Change-Id: I8c50d9b5acc25b92fbc8a4d291167df72c67c370