tree 5da75c2d8e34b332ce047b0304b45e50571f9b12
parent f89cb15152c4d19db35462583d79eda669c0c87d
parent 422d5b0126fb072a657bb9bd268251bc1cb6fb6e
author Matthew Xie <mattx@google.com> 1394563921 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394563921 +0000

am 422d5b01: Merge "Avoid race condition that gets PanService stuck in STATE_DISCONNECTED."

* commit '422d5b0126fb072a657bb9bd268251bc1cb6fb6e':
  Avoid race condition that gets PanService stuck in STATE_DISCONNECTED.