OSDN Git Service

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

Change-Id: I469dec8b95e75b083af9d5f5d5bce836f14ef8a6


Trivial merge