OSDN Git Service

Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Thu, 6 Jul 2017 20:21:22 +0000 (20:21 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 6 Jul 2017 20:21:22 +0000 (20:21 +0000)
commit9d53a4966550c9e484e28149252749f13ca72e73
treea47b0e0289e9ae7c668491930781a66f82017ee5
parent5ce05725bae6c37cb47dc804de837d4109c4314d
parent11219a523a888109cb226908cde954eb88bcd6cc
Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev am: f259a1975b" into oc-dr1-dev-plus-aosp am: 644c0a2690"