OSDN Git Service

am 3cbc9a37: am f4932db3: Merge "Sniff: Use correct sniff configuration for PAN ...
authorAndre Eisenbach <eisenbach@google.com>
Thu, 28 May 2015 17:46:26 +0000 (17:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 28 May 2015 17:46:26 +0000 (17:46 +0000)
* commit '3cbc9a37054c95a1ecdd85b489c7936a8dd667c5':
  Sniff: Use correct sniff configuration for PAN & HS


Trivial merge