OSDN Git Service

Merge "Merge "Keep WIFI_FEATURE defines in sync with HAL" am: cdad7f334b am: 9db72235...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 17 Jan 2017 19:08:45 +0000 (19:08 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 17 Jan 2017 19:08:49 +0000 (19:08 +0000)
commitab8ebeafa261631bbc44ef19122db4f5da1f2ff6
tree7439245d1ce6d4504d933cc57c7ab54a16766f1c
parente0c2adaff49330a3cbbe608ff0757b4e3933b5c7
parentd061cf5f6c13996fc59ee0909729af90fffbd944
Merge "Merge "Keep WIFI_FEATURE defines in sync with HAL" am: cdad7f334b am: 9db7223591 am: 3d12f1b928" into nyc-mr2-dev-plus-aosp