OSDN Git Service

am 928bbf51: (-s ours) am b357f271: am e50c7933: DO NOT MERGE Do not set sig_id in...
authorMatthew Xie <mattx@google.com>
Tue, 4 Nov 2014 02:55:04 +0000 (02:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 Nov 2014 02:55:04 +0000 (02:55 +0000)
commit082c22e7b32b7ab77486b9afd95f29fccc5069ad
treed8391bc28c4a9650765e1ff7d5f29b319473a3b1
parent0659c71c2d8b5a0d4c3404895703ecd70c8ca602
parent928bbf51d57242edf67176ad754f717890b71431
am 928bbf51: (-s ours) am b357f271: am e50c7933: 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 automerge: 0570fd9  -s ours

* commit '928bbf51d57242edf67176ad754f717890b71431':