| commit | 9d25ec856a91bea67f18c4eb997ca6e8af16b05d | [log] [tgz] |
|---|---|---|
| author | Nancy Chen <nancychen@google.com> | Fri Sep 05 22:04:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 05 22:04:45 2014 +0000 |
| tree | 9d3ff6047141dcd13d5f8e66f8d8a3709165f56d | |
| parent | d73c816d94bd9aad5bbbfc627fd39870d62fa772 [diff] | |
| parent | 20b45fde192c857c39d7a4e400ba04877981ec65 [diff] |
am 20b45fde: am aa18e9cc: Rename listener to callback for ConferenceManager and rename strings 3/4 * commit '20b45fde192c857c39d7a4e400ba04877981ec65': Rename listener to callback for ConferenceManager and rename strings 3/4