tree a098bc6f067f2781ac99a6a2838ad151f75c4861
parent 041e10c9d751a20c9a795fd3eaac2cf2bf85f69c
parent 4f50c67a7fea821d8ea13131035a8aac0ec41434
author Martijn Coenen <maco@google.com> 1438673336 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1438673336 +0000

Merge "Fix conflict vendor proprietary Protocol and Discovery technology definitions"