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:18:04 +0000 (02:18 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 6 Jul 2017 02:18:04 +0000 (02:18 +0000)
commit0a3d44816bb34750dbe4fab8d063fb889b904ae1
treed1db82864c5377a1ddf7cfc1f8e2c44988a9e9b6
parent0a979d1124d0b8518d614779c0bbd3e8a0532c9f
parent2c9ee43013696bfc172e183b7ab515b3d860b2a9
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: 7b8650397f"