OSDN Git Service

Merge "HID: Prevent incoming and outgoing SDP collision"
authorHemant Gupta <hemantg@codeaurora.org>
Tue, 17 May 2016 19:28:28 +0000 (19:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 May 2016 19:28:28 +0000 (19:28 +0000)
am: d1e432ee05

* commit 'd1e432ee05d847f85380521a9d0a225c57fbc8f9':
  HID: Prevent incoming and outgoing SDP collision

Change-Id: Icb1c82876f4bf5f408b74e97ca5daf65c9e8651d


Trivial merge