| commit | 54aa01cab3ef24dc33d871fc98a0845cfb2ab59d | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Tue Aug 04 07:28:56 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Aug 04 07:28:56 2015 +0000 |
| tree | a098bc6f067f2781ac99a6a2838ad151f75c4861 | |
| parent | 041e10c9d751a20c9a795fd3eaac2cf2bf85f69c [diff] | |
| parent | 4f50c67a7fea821d8ea13131035a8aac0ec41434 [diff] |
Merge "Fix conflict vendor proprietary Protocol and Discovery technology definitions"