tree 0c4aca6f8801206de6eb951fb552ab85ab045d06
parent 71c2aab87a9c1655b18de9d78cda7096ef25536b
parent 864217e225e91d3c476d0b6272ac65b51fa81579
author George Mount <mount@google.com> 1483566862 +0000
committer android-build-merger <android-build-merger@google.com> 1483566862 +0000

Merge "Fix NPE when a shared element doesn't have a matching transitionName." into nyc-support-25.1-dev
am: 864217e225

Change-Id: I84fd776b1c0f6e8e6a038a9bceaa2c4dbcf91059