OSDN Git Service

Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev...
authorHiroki Yamamoto <hiroki.a.yamamoto@sony.com>
Thu, 6 Jul 2017 19:05:27 +0000 (19:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 19:05:27 +0000 (19:05 +0000)
am: 6e6b4f713f

Change-Id: I699b77d13cbb759ea1d06b4db048fb9a68b0f579


Trivial merge