OSDN Git Service

Merge "[NAN-AWARE] Rename NAN to Aware" am: ab180e53b9
authorEtan Cohen <etancohen@google.com>
Sun, 6 Nov 2016 03:21:54 +0000 (03:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 6 Nov 2016 03:21:54 +0000 (03:21 +0000)
am: 3aa7f61eba

Change-Id: I28cc8ef7a2589683fb16b9498ae1c2abfe2bf925


Trivial merge