commit | 96272d57caa39566842795ba1f0605a5a5f72272 | [log] [tgz] |
---|---|---|
author | Marco Nelissen <marcone@google.com> | Fri Aug 24 17:18:25 2012 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Aug 24 17:18:25 2012 -0700 |
tree | 1ca35139ef23f8758896eda687ac12882ec9f8d3 | |
parent | b0c1e303913f606dca15bfb75c029f3d4a1ab04c [diff] | |
parent | fd7ec80f3d0e30c8df61b86951d926ab9c8c6d25 [diff] |
Merge "Fix deadlock" into jb-mr1-dev