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 19:07:38 +0000 (19:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 19:07:38 +0000 (19:07 +0000)
commitcd5899786972e363e9f578d6525b67cfc659e810
tree1a115dcda8db783e59278620f0bdfef452dce589
parented9a7363d768d5be0c31caa598048f0528a13bf8
parent6e6b4f713f3b3404e8f7a812266d4e4b4888a502
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev am: f259a1975b
am: 6e6b4f713f

Change-Id: Iaf49a6db40f8f5c9b50929370319db796730d147