OSDN Git Service

Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Thu, 6 Jul 2017 19:06:43 +0000 (19:06 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 6 Jul 2017 19:06:43 +0000 (19:06 +0000)

Trivial merge