| commit | 242889087969cd6dcffde421a41a65fd45768dd3 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Tue Nov 15 19:43:32 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 15 19:43:32 2011 -0800 |
| tree | 152877e4ac9f6c791e0ef68e6d8114d51466bc0f | |
| parent | d9d967fa8a7858e2a4d9abb159bfe731b931e1e3 [diff] | |
| parent | d479bc934377d44b838c63ff41464ecd1e68acb7 [diff] |
am cbcf8259: am cdec187a: Merge "Whoops, need to acquire lock." into ics-mr1 * commit 'cbcf8259697d2cb9025657a88e01cbb84be11d70': Whoops, need to acquire lock.