OSDN Git Service

Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover...
authorHiroki Yamamoto <hiroki.a.yamamoto@sony.com>
Thu, 6 Jul 2017 02:14:02 +0000 (02:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 02:14:02 +0000 (02:14 +0000)
commit3e6a9749502295361a7db8bd872c7afda6992074
treed1db82864c5377a1ddf7cfc1f8e2c44988a9e9b6
parentbdef215c41cb3f03def7070a99fe2583e4f385e1
parente3053f33d890801fd9cd685b3edad464c26e57a6
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

Change-Id: I983338beef28501a7c7977f0cba73f7b4e448768