OSDN Git Service

Merge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks." am: bc3d106b97
authorEtan Cohen <etancohen@google.com>
Fri, 23 Sep 2016 04:16:50 +0000 (04:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Sep 2016 04:16:50 +0000 (04:16 +0000)
am: a29bcecad9

Change-Id: I622b78805d08a4e9c59e207598ebc5f3cbf8d135


Trivial merge