Commits
Nancy Chen authored and Android Git Automerger committed eec15f90e7bM
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
Showing diff tocf2858d363c