tree 2f22907a15f22d512d3d806811c7cdf7f7b1dfeb
parent 044492e1b710c1e604c02b08e0ec97cbb1d5d513
parent 08881385a86bf887669a555ae03759c374ec9c50
author Craig Mautner <cmautner@google.com> 1404767985 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404767985 +0000

am 08881385: Merge "[ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager."

* commit '08881385a86bf887669a555ae03759c374ec9c50':
  [ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager.