| commit | 322282caec2fdcc2320c9318731213d6fb1efbcb | [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 | 1c5c1517768592ca0a10613051f7d9ad7c26e12b | |
| parent | 7df95a3b4a7e5d1dc989a2fd9c6b38c7b89fddfd [diff] | |
| parent | 5985240966988b806ae2659a95741f692ce47ff8 [diff] |
am 54aa01ca: Merge "Fix conflict vendor proprietary Protocol and Discovery technology definitions" * commit '54aa01cab3ef24dc33d871fc98a0845cfb2ab59d': Fix conflict vendor proprietary Protocol and Discovery technology definitions