OSDN Git Service

(root) / android-x86 / system-bt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e350222 25fdacf)
am 25fdacfa: (-s ours) DO NOT MERGE: add support for custom sniff configuration
authorAdam Hampson <ahampson@google.com>
Tue, 27 May 2014 17:13:05 +0000 (17:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 27 May 2014 17:13:05 +0000 (17:13 +0000)
* commit '25fdacfa0bae80a45541a9f4ecf22d6fad431326':
  DO NOT MERGE: add support for custom sniff configuration


Trivial merge
system/bt
About OSDN
Find Software
Develop Software
Help