OSDN Git Service

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

Change-Id: I16520e6aa16e49b33bf393e2cdc3bd1ae8f3fdc4


Trivial merge