| commit | cdec187a27b2acc34cd4df26b836b83362527d6a | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Tue Nov 15 19:04:11 2011 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Nov 15 19:04:11 2011 -0800 |
| tree | 488017fd1bb32a3d20beb5c536a92ee6c268b7f7 | |
| parent | 0ddb0143895b816d4ff5c174b346390e07f26556 [diff] | |
| parent | 7aa6d31240787da87bb06d4457fdf23e39c46f98 [diff] |
Merge "Whoops, need to acquire lock." into ics-mr1