OSDN Git Service

Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev
authorHiroki Yamamoto <hiroki.a.yamamoto@sony.com>
Thu, 6 Jul 2017 18:46:41 +0000 (18:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 18:46:41 +0000 (18:46 +0000)
commit6e6b4f713f3b3404e8f7a812266d4e4b4888a502
tree960a3f3cf0b2530bd56105b7e839de99324b33ff
parentf888e4248a32febd64feb6ea3fbeab5b3e0b0507
parentf259a1975bf45737f10ff6fd00e090d92c1f50c3
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev
am: f259a1975b

Change-Id: I89bc4bb9469a1bd316eabe22abaf7ee2c10fc02c