| commit | 5f6f77e2dc1a579e9915a74cf1a30417a032e7d1 | [log] [tgz] |
|---|---|---|
| author | Nancy Chen <nancychen@google.com> | Fri Sep 05 21:46:28 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Sep 05 21:46:28 2014 +0000 |
| tree | 60163f23d94f1d7c418ebc25d922f59bf95514b8 | |
| parent | 075a021429de28760672ecaba0bd4bde2c9200d1 [diff] | |
| parent | 066fc775ad653e0ce94b6253746081f6a5ea5272 [diff] |
Merge "Rename listener to callback for ConferenceManager and rename strings 2/4" into lmp-dev