| commit | 8e56e1f3459703a9b9f5a13676428eeda68bb73f | [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 | a557cb549fa4eb8aae56bcfc56f14a0a1ac1fbc4 | |
| parent | 29270da5f7dee7e81b9d69446c7d2030aea6ff74 [diff] | |
| parent | cbcf8259697d2cb9025657a88e01cbb84be11d70 [diff] |
am cbcf8259: am cdec187a: Merge "Whoops, need to acquire lock." into ics-mr1 * commit 'cbcf8259697d2cb9025657a88e01cbb84be11d70': Whoops, need to acquire lock.