| commit | d479bc934377d44b838c63ff41464ecd1e68acb7 | [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 | 292e5ba0cb97a91fbd909b0fc31b8a2b1f9adb82 | |
| parent | 5dee8cef9341500fcfda06eacebc137bd252f209 [diff] | |
| parent | f81caa67c08a56b90605513406674fdbb6a135f5 [diff] |
am cdec187a: Merge "Whoops, need to acquire lock." into ics-mr1 * commit 'cdec187a27b2acc34cd4df26b836b83362527d6a': Whoops, need to acquire lock.