OSDN Git Service

am 0604f9b7: am f9b8c88c: Merge "Introduce config setting for scanning mac OUI" into...
authorVinit Deshpande <vinitd@google.com>
Thu, 25 Sep 2014 16:38:15 +0000 (16:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 25 Sep 2014 16:38:15 +0000 (16:38 +0000)
* commit '0604f9b7eaf51920c177f5af845bb254c3695074':
  Introduce config setting for scanning mac OUI


Trivial merge