Merge "[NAN-AWARE] Rename NAN to Aware [DO NOT MERGE] am: a61b9fb569 -s ours"

This commit is contained in:
Android Build Merger (Role)
2016-11-03 20:06:13 +00:00
committed by Android (Google) Code Review

Diff Content Not Available