tree 7740ac7d8b06cfd0d8cb0a15c2ad8e978ae2f565
parent ffce0588381e33bac66ab9044d1c9b7610ee801c
parent c3c238a3e3b3de9ced4d632182027b4af6ee7656
author Andrew Lee <anwlee@google.com> 1417561481 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417561481 +0000

am c3c238a3: Merge "Properly convert GENERIC_CONFERENCE capabilities." into lmp-mr1-dev

* commit 'c3c238a3e3b3de9ced4d632182027b4af6ee7656':
  Properly convert GENERIC_CONFERENCE capabilities.