| commit | bd53a1c0372cdf7deeb07e5146492f1cf4919e19 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Tue Aug 04 07:43:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 04 07:43:46 2015 +0000 |
| tree | a098bc6f067f2781ac99a6a2838ad151f75c4861 | |
| parent | 7cbaea4f1495b2e8232150807d69b129917f4c55 [diff] | |
| parent | 54aa01cab3ef24dc33d871fc98a0845cfb2ab59d [diff] |
am 54aa01ca: Merge "Fix conflict vendor proprietary Protocol and Discovery technology definitions" * commit '54aa01cab3ef24dc33d871fc98a0845cfb2ab59d': Fix conflict vendor proprietary Protocol and Discovery technology definitions