Commit b5ae33c2 authored by Etan Cohen's avatar Etan Cohen Committed by android-build-merger
Browse files

Merge "[NAN-AWARE] Rename NAN to Aware" am: ab180e53 am: 3aa7f61e am: 53cb11bc 

am: 23c8e134  -s ours

Change-Id: I214f10149fc5656b20c58689142558af225ac33d
parents f3e98625 23c8e134
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment