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)
commit7417f6085670277656f2a196f9a6fbe9eb58315e
tree65d0d313e41eac0d23febf0ae5437d22e5c75027
parentf59832297fd6b9c0d442da0d87424eebde22c9d1
parent1ea03994927037fb9c739ef8ee6f28b202631371
Merge "[AWARE]: Document the default values in NAN enable/config"
am: 1ea0399492

Change-Id: I469dec8b95e75b083af9d5f5d5bce836f14ef8a6