tree 9d635d3c3dd47d36f6af7b9c5f718b46d3fe3f13
parent f88e7035e723955ecac19d2013d7fc2f1652d142
parent acf1ec0cfce2d61dcab8560cad5072fa30afeb82
author Jizhou Liao <Jizhou.Liao@nxp.com> 1438603369 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438603369 +0000

am acf1ec0c: Fix conflict vendor proprietary Protocol and Discovery technology definitions

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