tree fbcdb931aae8322ca949e281f34be3d1075b6e33
parent 4bc87627a4ddfe86185604d3c0bba98507fced24
parent 5abffd26b39ebde68d9d63d48748f68155abbdd3
author George Mount <mount@google.com> 1411142595 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411142595 +0000

am aeebb25c: am 04a96bca: Merge "Fix NPE when shared element listener is null." into lmp-dev

* commit 'aeebb25c9d29e1768effff0d90df4ec1426554f3':
  Fix NPE when shared element listener is null.