Commits
Andrew Lee authored and Android Git Automerger committed 76cc56c0f94M
am 3f424477: am e6a1e993: Merge "Add GENERIC_CONFERENCE to phone capabilities." into lmp-mr1-dev * commit '3f4244773d4479c79705dc397abf0d76555d7ef9': Add GENERIC_CONFERENCE to phone capabilities.
Showing diff to3f4244773d4