From: Hiroki Yamamoto <hiroki.a.yamamoto@sony.com>
Date: Thu, 6 Jul 2017 02:15:35 +0000 (+0000)
Subject: Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover... 
X-Git-Tag: android-x86-9.0-r1~1825^2~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=66c5847996c5937dbb9c56999237e5da96140716;p=android-x86%2Fframeworks-base.git

Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am: 21187ba5cc am: 1a6d0d753e" into oc-dev-plus-aosp am: 808ae634dd" into oc-dr1-dev-plus-aosp
am: e3053f33d8

Change-Id: I87fed8dc4ad07c785966ea45557b5de3c1a358b6
---

66c5847996c5937dbb9c56999237e5da96140716