tree 15b47b4c53ffec2c5d25c76df816d0ac42c5f96f
parent 18da04ed2ceccedae462a21511159018d52691de
parent b694f5edfbca9fa85f775fc2e05daf318c912a01
author Android Build Merger (Role) <android-build-merger@google.com> 1478203573 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1478203576 +0000

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