| commit | 734e831157b755c399122cca1e2236638201540c | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Fri Aug 24 17:20:24 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 24 17:20:24 2012 -0700 |
| tree | 1ca35139ef23f8758896eda687ac12882ec9f8d3 | |
| parent | 89e6b55619b6e9c0f2a8dc83ee0ad88b62ff3533 [diff] | |
| parent | 96272d57caa39566842795ba1f0605a5a5f72272 [diff] |
am 96272d57: Merge "Fix deadlock" into jb-mr1-dev * commit '96272d57caa39566842795ba1f0605a5a5f72272': Fix deadlock