| commit | acb10eca6be7ebf130e58bcb704ffab936d36658 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Tue Aug 04 07:50:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 04 07:50:30 2015 +0000 |
| tree | 9d635d3c3dd47d36f6af7b9c5f718b46d3fe3f13 | |
| parent | f367b88acafd2c86fb766de240296ea2fba24561 [diff] | |
| parent | 54aa01cab3ef24dc33d871fc98a0845cfb2ab59d [diff] |
am 54aa01ca: (-s ours) Merge "Fix conflict vendor proprietary Protocol and Discovery technology definitions" * commit '54aa01cab3ef24dc33d871fc98a0845cfb2ab59d': Fix conflict vendor proprietary Protocol and Discovery technology definitions