tree 09aa3fc083fad5f2715fb726b1478761073b8383
parent 87303c76d7e472818b3379475241191cd2b3e3aa
parent 236993560aad078736afd36323ed0dafa13005c2
author Matthew Xie <mattx@google.com> 1415049229 +0000
committer android-build-merger <android-build-merger@google.com> 1415049229 +0000

DO NOT MERGE Do not set sig_id in gerneral reject message per AVDTP SPEC 1.2 automerge: 595bcb4  -s ours
automerge: 2369935  -s ours

* commit '236993560aad078736afd36323ed0dafa13005c2':