| commit | 5631a329eb440ef29e88614d4b89a876f8962096 | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Fri Nov 07 02:04:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 07 02:04:25 2014 +0000 |
| tree | 1614573b5811db49f8be5e4357ff7499b76b657d | |
| parent | b8683629356ccc41d76640f6f732282664220bbd [diff] | |
| parent | cf4d1335a76296a2b1cc3880198d3d28c13924bd [diff] |
am cf4d1335: Merge "Disable MANAGE_CONFERENCE in TelephonyConference." into lmp-mr1-dev * commit 'cf4d1335a76296a2b1cc3880198d3d28c13924bd': Disable MANAGE_CONFERENCE in TelephonyConference.