OSDN Git Service

Merge "wifi: Add scanning mac oui setter" am: fc5a779766 am: 2666dcea2e am: 7a7c31c68c
authorRoshan Pius <rpius@google.com>
Thu, 2 Feb 2017 19:59:23 +0000 (19:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 2 Feb 2017 19:59:23 +0000 (19:59 +0000)
am: dfa48d443b

Change-Id: I5e81b5a0118b20f480e51f0e3129e825f1cd5fbf


Trivial merge