OSDN Git Service

Merge "[NAN-AWARE] Rename NAN to Aware" am: 74b1131cc8 am: 6571007101 am: a99a05982e
authorEtan Cohen <etancohen@google.com>
Sun, 6 Nov 2016 03:38:18 +0000 (03:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 6 Nov 2016 03:38:18 +0000 (03:38 +0000)
commit883461a6d42df1b99549f547ffa937c5d4da1753
tree73c4cc55312cd9bd86e7f57e9032d8ae98ebbd08
parent3a1dd86ce48533055b062364a2bd567a259abf71
parent2ad6b14d5060763653b2937bb4a5855064f24999
Merge "[NAN-AWARE] Rename NAN to Aware" am: 74b1131cc8 am: 6571007101 am: a99a05982e
am: 2ad6b14d50  -s ours

Change-Id: Id51e99533ce8ab29bd40170f8eafc0f9702c16fb