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

Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev am: f259a1975b
am: 6e6b4f713f

Change-Id: I699b77d13cbb759ea1d06b4db048fb9a68b0f579
---

fd57c14ea5c8c079fd8042742189b146b695ba83