OSDN Git Service

Merge "[NAN-AWARE] Rename NAN to Aware"
authorEtan Cohen <etancohen@google.com>
Sat, 5 Nov 2016 16:19:39 +0000 (16:19 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 5 Nov 2016 16:19:43 +0000 (16:19 +0000)
1  2 
Android.mk

diff --cc Android.mk
Simple merge