| commit | 1aa570500e96a3eee168072c689cb02a09e6bef4 | [log] [tgz] |
|---|---|---|
| author | Nancy Chen <nancychen@google.com> | Fri Sep 05 21:52:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 05 21:52:25 2014 +0000 |
| tree | 94e346443d497be700d31e531c58262737f17d03 | |
| parent | 15d3a4ae9e380146cf4f3a3eae8f2dbe8bfbc81c [diff] | |
| parent | cf2858d363cfde6024752998363ed1cb1436491d [diff] |
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