Commits
Andrew Lee authored and Android Git Automerger committed 3f4244773d4M
am e6a1e993: Merge "Add GENERIC_CONFERENCE to phone capabilities." into lmp-mr1-dev * commit 'e6a1e993c2e3663ee60085b66fe8697d5de6e268': Add GENERIC_CONFERENCE to phone capabilities.
Showing diff to29db396ea91