tree a098bc6f067f2781ac99a6a2838ad151f75c4861
parent 7cbaea4f1495b2e8232150807d69b129917f4c55
parent 54aa01cab3ef24dc33d871fc98a0845cfb2ab59d
author Martijn Coenen <maco@google.com> 1438674226 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438674226 +0000

am 54aa01ca: Merge "Fix conflict vendor proprietary Protocol and Discovery technology definitions"

* commit '54aa01cab3ef24dc33d871fc98a0845cfb2ab59d':
  Fix conflict vendor proprietary Protocol and Discovery technology definitions