tree 75047f4d7b9c21f12c8cc86794cee81822e65ba7
parent 36904fbc94d19c6e77146f5d2ba9eb9c896025da
parent 506350b6ddf782ec1f35f4b20b2a833d2313eafa
author Treehugger Robot <treehugger-gerrit@google.com> 1499304610 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1499304610 +0000

Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover"