tree 4600cac627ada1d1879466ef19137452a0f94a04
parent aaabb0bc19476b5149e4689f6dab217a19fdf1ae
parent 88dcd1a5f7d0109e460f8938096063d1a18224c3
author George Mount <mount@google.com> 1409931022 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409931022 +0000

am 47229456: Merge "API Review: Change SharedElementListener to SharedElementCallback." into lmp-dev

* commit '472294569a26cb60d75202d5bc13e44fb040dbce':
  API Review: Change SharedElementListener to SharedElementCallback.