| commit | 8094064bbe72b6a663d872962f830e452088356b | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Tue Dec 02 23:11:26 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 02 23:11:26 2014 +0000 |
| tree | 2d7f841856c88138aab234c2faa59c485ef34481 | |
| parent | 7e53272541bf8b5de03ee2622dc972d67f6a9e7b [diff] | |
| parent | 976fea98681dd6622685a4f7887aec3c05b5921b [diff] |
am 976fea98: am c3c238a3: Merge "Properly convert GENERIC_CONFERENCE capabilities." into lmp-mr1-dev * commit '976fea98681dd6622685a4f7887aec3c05b5921b': Properly convert GENERIC_CONFERENCE capabilities.