OSDN Git Service

Merge "Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handov...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Thu, 6 Jul 2017 02:06:14 +0000 (02:06 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 6 Jul 2017 02:06:14 +0000 (02:06 +0000)
commit7b8650397f7c9b326324c9f8295ceaf6b0645fe6
treed844ad2720314e17a185e21a5d90750522b9152e
parente3053f33d890801fd9cd685b3edad464c26e57a6
parent84f9f6fcdd5d7ab263d7311ade11bcb5dfb3b3ab
Merge "Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am: 21187ba5cc" into stage-aosp-master am: 17f2f1633b" into oc-dev-plus-aosp am: bdbe454b7a" into oc-dr1-dev-plus-aosp