tree 94e346443d497be700d31e531c58262737f17d03
parent 15d3a4ae9e380146cf4f3a3eae8f2dbe8bfbc81c
parent cf2858d363cfde6024752998363ed1cb1436491d
author Nancy Chen <nancychen@google.com> 1409953945 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409953945 +0000

am 266fcee6: Merge "Rename listener to callback for ConferenceManager and rename strings 1/4" into lmp-dev

* commit '266fcee694598b685fb4d33c6e6a581b0152704d':
  Rename listener to callback for ConferenceManager and rename strings 1/4