tree b6e01c4e8804ef4cbd1324ce81673fe4c20c15bb
parent 6722598ef3d23f75d244399536b2302b30388c51
parent 49e213cd7de1d6ff4f7bb27caafd57971bd0a734
author Andrew Lee <anwlee@google.com> 1416423639 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1416423641 +0000

Merge "Add GENERIC_CONFERENCE to phone capabilities." into lmp-mr1-dev