Skip to content
Commit 883461a6 authored by Etan Cohen's avatar Etan Cohen Committed by android-build-merger
Browse files

Merge "[NAN-AWARE] Rename NAN to Aware" am: 74b1131c am: 65710071 am: a99a0598 

am: 2ad6b14d  -s ours

Change-Id: Id51e99533ce8ab29bd40170f8eafc0f9702c16fb
parents 3a1dd86c 2ad6b14d
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment