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)
commit31baeb017c9b38d7ea3ab9048b77977ec96b9137
tree1a115dcda8db783e59278620f0bdfef452dce589
parent7ee73b24b292ab05e7866a2cb9ac0d01155aaf13
parentfd57c14ea5c8c079fd8042742189b146b695ba83
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev am: f259a1975b am: 6e6b4f713f"