| commit | 06c967948be85ef93bd1df6bdbf55b4e9c895b26 | [log] [tgz] |
|---|---|---|
| author | Jizhou Liao <Jizhou.Liao@nxp.com> | Mon Aug 03 12:02:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 03 12:02:49 2015 +0000 |
| tree | 9d635d3c3dd47d36f6af7b9c5f718b46d3fe3f13 | |
| parent | f88e7035e723955ecac19d2013d7fc2f1652d142 [diff] | |
| parent | acf1ec0cfce2d61dcab8560cad5072fa30afeb82 [diff] |
am acf1ec0c: Fix conflict vendor proprietary Protocol and Discovery technology definitions * commit 'acf1ec0cfce2d61dcab8560cad5072fa30afeb82': Fix conflict vendor proprietary Protocol and Discovery technology definitions