| commit | 3bc1bafabaedffede8963703cf3bfde2054ef91a | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Mon Jul 07 21:24:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 07 21:24:41 2014 +0000 |
| tree | 1c3f2149b3f086ccaf5c137f55caba33a906823b | |
| parent | b9c27e40addb72551dd1938a5a54aa1c56e2a6c5 [diff] | |
| parent | 6d6d2189625a679948920861b957948b505cb53f [diff] |
am 6d6d2189: am 08881385: Merge "[ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager." * commit '6d6d2189625a679948920861b957948b505cb53f': [ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager.