tree 7947b2ad28aaadee121227f0e47f23d516079789
parent 752c0e95d6a931eb62117d5d67d2814158cc576c
parent 7486328d6c45e5c256371403f91f93efa8ff6511
author Vinit Deshpande <vinitd@google.com> 1411603180 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411603180 +0000

am f9b8c88c: Merge "Introduce config setting for scanning mac OUI" into lmp-dev

* commit 'f9b8c88c6529daebe9676d7c440fcd3e478ec034':
  Introduce config setting for scanning mac OUI