tree 716924a3d7fd3c08368b4874a4b325467eb9bcd0
parent 4a62720f47f759a09fefd60dacea8b3ebf00fdd6
parent dcac00f32528ff9c1471093f20d5fc8b3b7bb912
author Etan Cohen <etancohen@google.com> 1474520121 +0000
committer android-build-merger <android-build-merger@google.com> 1474520121 +0000

Merge "[NAN] Method renames based on API council feedback"
am: dcac00f325

Change-Id: I1eaa81952e2826f25de9e3e9f4edfa23db368f5a