OSDN Git Service

Merge "Wi-Fi/NAN HAL/service fixups" am: 7f1c9647b8 am: cc195e0c67 am: 2ea0959e5c
authorEtan Cohen <etancohen@google.com>
Wed, 1 Feb 2017 05:44:24 +0000 (05:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 1 Feb 2017 05:44:24 +0000 (05:44 +0000)
am: ab42f95376

Change-Id: I933127293e1d7eabaf507eb1c08ac5ca5a5c6127


Trivial merge