| commit | cf2858d363cfde6024752998363ed1cb1436491d | [log] [tgz] |
|---|---|---|
| author | Nancy Chen <nancychen@google.com> | Fri Sep 05 21:46:26 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Sep 05 21:46:27 2014 +0000 |
| tree | 3e10922d5e259a42802fb509a062c46e507d1cc8 | |
| parent | d87f2107d9d8d8e7bbc63613203f8a5c5b07b75f [diff] | |
| parent | 1d834f51df5396653ce669e614f9e7ef2cbd4a06 [diff] |
Merge "Rename listener to callback for ConferenceManager and rename strings 1/4" into lmp-dev