OSDN Git Service

Merge "Keep WIFI_FEATURE defines in sync with HAL" am: cdad7f334b am: 9db7223591...
authorRandy Pan <zpan@google.com>
Tue, 17 Jan 2017 19:21:59 +0000 (19:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Jan 2017 19:21:59 +0000 (19:21 +0000)
am: d061cf5f6c

Change-Id: I1724e30ef5af246ddf5056533b3bc0321267a505


Trivial merge