OSDN Git Service

DO NOT MERGE Do not set sig_id in gerneral reject message per AVDTP SPEC 1.2 automerg...
authorMatthew Xie <mattx@google.com>
Mon, 3 Nov 2014 21:13:49 +0000 (21:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 3 Nov 2014 21:13:49 +0000 (21:13 +0000)
automerge: 2369935  -s ours

* commit '236993560aad078736afd36323ed0dafa13005c2':


Trivial merge