| commit | c3c238a3e3b3de9ced4d632182027b4af6ee7656 | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Tue Dec 02 22:57:37 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Dec 02 22:57:39 2014 +0000 |
| tree | 7740ac7d8b06cfd0d8cb0a15c2ad8e978ae2f565 | |
| parent | f834f422b5d2891e9e8f70170ba0ec33c41b9ed8 [diff] | |
| parent | a21edb812cc2c5af94bdbb1f7d2d96ee1d9f4fb9 [diff] |
Merge "Properly convert GENERIC_CONFERENCE capabilities." into lmp-mr1-dev