OSDN Git Service

Merge "[NAN] Fix incorrect log message" am: fe0f393116
authorEtan Cohen <etancohen@google.com>
Mon, 26 Sep 2016 21:03:07 +0000 (21:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 26 Sep 2016 21:03:07 +0000 (21:03 +0000)
am: e452d1e317

Change-Id: Icea741b90b9d45e8cde424d841e73ee3613135d8


Trivial merge