OSDN Git Service

Merge "Merge "Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Thu, 6 Jul 2017 02:20:47 +0000 (02:20 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 6 Jul 2017 02:20:47 +0000 (02:20 +0000)
commitcaf9c30cf7c0b16792d63d2a079009a210ed806d
treed1db82864c5377a1ddf7cfc1f8e2c44988a9e9b6
parentc22722c1975b5406286dc5d7fa4a29c445198ae6
parent48fb9329ea1c7c1b8ff5c52c44d9122f9c41e377
Merge "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 am: 15a1363463"