| commit | cf4d1335a76296a2b1cc3880198d3d28c13924bd | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Fri Nov 07 01:54:12 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Nov 07 01:54:14 2014 +0000 |
| tree | ce6cbbdcf0b6e86c05b5333daa7e04e384b2ef73 | |
| parent | 0348766dac5e533767e77072e1c6ffa6742e44d5 [diff] | |
| parent | 09bb16f9d7e4ffa790132285d9e8583ebe4af0fe [diff] |
Merge "Disable MANAGE_CONFERENCE in TelephonyConference." into lmp-mr1-dev