OSDN Git Service

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

Change-Id: I1019b5c514424043144351aa893b4f5048e4207e


Trivial merge