| commit | 976fea98681dd6622685a4f7887aec3c05b5921b | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Tue Dec 02 23:04:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 02 23:04:41 2014 +0000 |
| tree | 7740ac7d8b06cfd0d8cb0a15c2ad8e978ae2f565 | |
| parent | ffce0588381e33bac66ab9044d1c9b7610ee801c [diff] | |
| parent | c3c238a3e3b3de9ced4d632182027b4af6ee7656 [diff] |
am c3c238a3: Merge "Properly convert GENERIC_CONFERENCE capabilities." into lmp-mr1-dev * commit 'c3c238a3e3b3de9ced4d632182027b4af6ee7656': Properly convert GENERIC_CONFERENCE capabilities.