OSDN Git Service

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

Change-Id: If1aa06332c6884bebdbb2027464fd4603c12757f


Trivial merge