commit | e6a1e993c2e3663ee60085b66fe8697d5de6e268 | [log] [tgz] |
---|---|---|
author | Andrew Lee <anwlee@google.com> | Wed Nov 19 19:00:39 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Nov 19 19:00:41 2014 +0000 |
tree | b6e01c4e8804ef4cbd1324ce81673fe4c20c15bb | |
parent | 6722598ef3d23f75d244399536b2302b30388c51 [diff] | |
parent | 49e213cd7de1d6ff4f7bb27caafd57971bd0a734 [diff] |
Merge "Add GENERIC_CONFERENCE to phone capabilities." into lmp-mr1-dev