| commit | b6c41523a61e95601905d839ad032d9238afb7ea | [log] [tgz] |
|---|---|---|
| author | Ariel Gertzenstein <agertzen@google.com> | Wed Apr 16 19:38:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 16 19:38:38 2014 +0000 |
| tree | 5126b6a8ff8feed75046734b872459bc46b5a5e8 | |
| parent | a904f04e5838c3d7e5b5a17b89febf7c5a4dc913 [diff] | |
| parent | 401e9bd33599a14059d5333c16497483e41bd20b [diff] |
am 401e9bd3: (-s ours) am 307c977d: DO NOT MERGE Avoid race condition that gets PanService stuck in STATE_DISCONNECTED. * commit '401e9bd33599a14059d5333c16497483e41bd20b': DO NOT MERGE Avoid race condition that gets PanService stuck in STATE_DISCONNECTED.