OSDN Git Service

Merge "Merge "Revert "DO NOT MERGE Proper construction of AVDTP general reject messag...
authorPankaj Kanwar <pkanwar@google.com>
Tue, 7 Jun 2016 00:21:55 +0000 (00:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 7 Jun 2016 00:21:55 +0000 (00:21 +0000)
am: 381d21a39f  -s ours

* commit '381d21a39fb13311c982b58c14393e607b65aa0d':

Change-Id: I3a5101f85f024ab3fa2fd4ea495f1cc6e27baaa3


Trivial merge