| commit | 5985240966988b806ae2659a95741f692ce47ff8 | [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 | 1c5c1517768592ca0a10613051f7d9ad7c26e12b | |
| parent | 1d515746dabbfc3df832ec80aeff7347b3ede295 [diff] | |
| parent | 5855a003daaf4255d9b6be6b242d0d109918458f [diff] |
Merge "Fix conflict vendor proprietary Protocol and Discovery technology definitions"