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 02:06:02 +0000 (02:06 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 6 Jul 2017 02:06:02 +0000 (02:06 +0000)
commite3053f33d890801fd9cd685b3edad464c26e57a6
treed844ad2720314e17a185e21a5d90750522b9152e
parent75fd97e073cc0d707090aa20e48e40d7188dcfcc
parent57e528f8ea41238d1bc8841646d4b803a8f3dbeb
Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am: 21187ba5cc am: 1a6d0d753e" into oc-dev-plus-aosp am: 808ae634dd" into oc-dr1-dev-plus-aosp