tree fe316960a200a35ac96ac8ced060c830750a0c81
parent bc74135d6af93e0217e6f9ac87247dfd4abd81aa
parent fe0f393116a0aeb1cea349d70d5bba2caf4c7952
author Etan Cohen <etancohen@google.com> 1474923487 +0000
committer android-build-merger <android-build-merger@google.com> 1474923487 +0000

Merge "[NAN] Fix incorrect log message"
am: fe0f393116

Change-Id: Ibfc65886bca7dbddf456cfe494b8ee5d3ea74295