| commit | 76cc56c0f94ff8f965ab33663649c100d86e4e9e | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Wed Nov 19 19:10:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 19 19:10:44 2014 +0000 |
| tree | 179a398e47ed1efdb0d323d48cea953f664198b7 | |
| parent | 387116f557c3d3ecf7bd82e1d9dd1910ca4c4a3d [diff] | |
| parent | 3f4244773d4479c79705dc397abf0d76555d7ef9 [diff] |
am 3f424477: am e6a1e993: Merge "Add GENERIC_CONFERENCE to phone capabilities." into lmp-mr1-dev * commit '3f4244773d4479c79705dc397abf0d76555d7ef9': Add GENERIC_CONFERENCE to phone capabilities.