| commit | 850e37811ea6adf4ca6bf64b85273c9e4df4f0f4 | [log] [tgz] |
|---|---|---|
| author | Randy Pan <zpan@google.com> | Tue Jan 17 19:21:59 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jan 17 19:21:59 2017 +0000 |
| tree | e8a6cab67baeebdd6a4715281e396b19310e034e | |
| parent | f47a7f5ac9308640399624718806a600bf17d7ce [diff] | |
| parent | d061cf5f6c13996fc59ee0909729af90fffbd944 [diff] |
Merge "Keep WIFI_FEATURE defines in sync with HAL" am: cdad7f334b am: 9db7223591 am: 3d12f1b928 am: d061cf5f6c Change-Id: I1724e30ef5af246ddf5056533b3bc0321267a505