tree 9df9c95375aec2cc4c62c44daacf74308f9bd65e
parent b5271649aadf488a8b8932d1deb1d00b8970e815
parent bc156ba430d286aaab8deb7bbb3bccc655cd2e92
author Matthew Williams <mjwilliams@google.com> 1412088995 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412088995 +0000

am bc156ba4: Merge "Fix deadlock caused by clearAllBackoffs in SSE" into lmp-dev

* commit 'bc156ba430d286aaab8deb7bbb3bccc655cd2e92':
  Fix deadlock caused by clearAllBackoffs in SSE