tree 73c4cc55312cd9bd86e7f57e9032d8ae98ebbd08
parent 935e92acb917d6b877a5b5d040e02758193a14ad
parent 0413327d741fe7246f9d5bf508da6f6b6a6a7476
author Etan Cohen <etancohen@google.com> 1478362779 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1478362783 +0000

Merge "[NAN-AWARE] Rename NAN to Aware"