OSDN Git Service

Merge "[AWARE]: Document the default values in NAN enable/config" am: 1ea0399492...
authorEtan Cohen <etancohen@google.com>
Thu, 16 Feb 2017 21:19:56 +0000 (21:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Feb 2017 21:19:56 +0000 (21:19 +0000)
am: c9a3c2b7e5

Change-Id: I213deacae4f5339b425833a65068fd3d802d0bcb


Trivial merge