OSDN Git Service

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

Change-Id: I75b3722f37d606e42effc9dee731210df958c7bd


Trivial merge