tree a14f74992c9ccb92aad10278730109d9091a3a01
parent 0dee1ec5bbaee99fbb53546c0b2487508e83c405
parent e7668dda0cd1f16e4161e6f0a64c685efc1ed25d
author Matthew Xie <mattx@google.com> 1394443246 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394443246 +0000

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

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