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)
am: f259a1975b

Change-Id: I89bc4bb9469a1bd316eabe22abaf7ee2c10fc02c


Trivial merge