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:08:35 +0000 (19:08 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 6 Jul 2017 19:08:35 +0000 (19:08 +0000)
commit6faabc1e3f9f89be3a2f4429105da1ad39337784
tree1a115dcda8db783e59278620f0bdfef452dce589
parent4e3978aa62adc60bc7e19cdf4171849407096f36
parentcd5899786972e363e9f578d6525b67cfc659e810
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev am: f259a1975b am: 6e6b4f713f"