| commit | ab8ebeafa261631bbc44ef19122db4f5da1f2ff6 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Tue Jan 17 19:08:45 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jan 17 19:08:49 2017 +0000 |
| tree | 7439245d1ce6d4504d933cc57c7ab54a16766f1c | |
| parent | e0c2adaff49330a3cbbe608ff0757b4e3933b5c7 [diff] | |
| parent | d061cf5f6c13996fc59ee0909729af90fffbd944 [diff] |
Merge "Merge "Keep WIFI_FEATURE defines in sync with HAL" am: cdad7f334b am: 9db7223591 am: 3d12f1b928" into nyc-mr2-dev-plus-aosp