| commit | cbcf8259697d2cb9025657a88e01cbb84be11d70 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Tue Nov 15 19:06:20 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 15 19:06:20 2011 -0800 |
| tree | 488017fd1bb32a3d20beb5c536a92ee6c268b7f7 | |
| parent | 4978c1a5b07782d622ca9e3eedd649a5927d226f [diff] | |
| parent | cdec187a27b2acc34cd4df26b836b83362527d6a [diff] |
am cdec187a: Merge "Whoops, need to acquire lock." into ics-mr1 * commit 'cdec187a27b2acc34cd4df26b836b83362527d6a': Whoops, need to acquire lock.