| commit | 08426453f3bad82051c7a2d3f8cd635984d5f5da | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Tue Apr 02 11:04:37 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 02 11:04:37 2013 -0700 |
| tree | b69b892292a981a29fc48c74e73fac06adb4fb37 | |
| parent | 6e5980f164d8b58a307351521095ad15cd746200 [diff] | |
| parent | 79b468dcaab89f52394132d5ee733c6a01bad7e9 [diff] |
am 79b468dc: Merge "Fix potential deadlock between LockScreen and WindowManagerService" into jb-mr2-dev-plus-aosp * commit '79b468dcaab89f52394132d5ee733c6a01bad7e9': Fix potential deadlock between LockScreen and WindowManagerService