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:16:30 +0000 (02:16 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 6 Jul 2017 02:16:30 +0000 (02:16 +0000)
commit0a979d1124d0b8518d614779c0bbd3e8a0532c9f
treed1db82864c5377a1ddf7cfc1f8e2c44988a9e9b6
parent071caefc1edcb605dc221e80826c4b412c5e7c88
parent66c5847996c5937dbb9c56999237e5da96140716
Merge "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 am: e3053f33d8"