tree ccb180cffb25f7c2cb74ab3b90c32f758d59cfe0
parent 052aff16ce1963dbe4814f9b5d28d6458cf06077
parent fa969cd1f93d186acc9ce781fffa6a2f66f915ea
author Elliott Hughes <enh@google.com> 1417709835 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417709835 +0000

am fa969cd1: am 023bc0a4: Merge "Fix deadlocks."

* commit 'fa969cd1f93d186acc9ce781fffa6a2f66f915ea':
  Fix deadlocks.