| commit | 7645753c7ce7deb5859083932f9e4c1c1a95693c | [log] [tgz] |
|---|---|---|
| author | Nancy Chen <nancychen@google.com> | Fri Sep 05 22:10:13 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 05 22:10:13 2014 +0000 |
| tree | acde95c088a2c6a522dc82c7ea5de097d37cb796 | |
| parent | 067a1780f56f6a883544fe3a9e93c590999d32d9 [diff] | |
| parent | e7824f8dc1ed9c5c64ebb6f3c7872a56c270fe10 [diff] |
am 4e4657ec: am 483354d9: am 266fcee6: Merge "Rename listener to callback for ConferenceManager and rename strings 1/4" into lmp-dev * commit '4e4657ecee856154a3afd8dcd172cfee4974487c': Rename listener to callback for ConferenceManager and rename strings 1/4