| commit | fba021eaacfb2b44fc36f9fb74bac08b32a841e5 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Thu Oct 18 23:26:11 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 18 23:26:11 2012 -0700 |
| tree | ba8d7e7dba8c179c75492dc0c1cc28e7b1c54bc6 | |
| parent | 744b4dca34e605b80e553a34327067abc862a320 [diff] | |
| parent | ce78b026179bc041bce9c9e2d8b63b79a97cbf67 [diff] |
am ce78b026: Merge "Fix deadlock." into jb-mr1-dev * commit 'ce78b026179bc041bce9c9e2d8b63b79a97cbf67': Fix deadlock.