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)
commit5ce05725bae6c37cb47dc804de837d4109c4314d
treea47b0e0289e9ae7c668491930781a66f82017ee5
parentb00b97631656c4e86e1fb52ecb0f4b8f1b11dfc9
parent644c0a26904e96d437d7786e649b285f53ab1277
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev am: f259a1975b" into oc-dr1-dev-plus-aosp
am: 644c0a2690

Change-Id: If1aa06332c6884bebdbb2027464fd4603c12757f