OSDN Git Service

Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover...
authorHiroki Yamamoto <hiroki.a.yamamoto@sony.com>
Thu, 6 Jul 2017 02:15:35 +0000 (02:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 02:15:35 +0000 (02:15 +0000)
am: e3053f33d8

Change-Id: I87fed8dc4ad07c785966ea45557b5de3c1a358b6


Trivial merge