tree db4efb4ce25452ae0c9bda17f4f35f8661febfa6
parent 5a9226ffd48b01a5c6993666e188731bc8a01a66
parent 17f2f1633ba3e025624ab45a55b7629abf51c0c8
author Hiroki Yamamoto <hiroki.a.yamamoto@sony.com> 1499306077 +0000
committer android-build-merger <android-build-merger@google.com> 1499306077 +0000

Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am: 21187ba5cc" into stage-aosp-master
am: 17f2f1633b

Change-Id: Icfc920a97ab07f01f9c5d9def88f4bcc63bd6058