| commit | ee2a8be8b40cfe7f94aaf10e35fc53230b63bef4 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Wed Dec 07 17:10:34 2011 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Dec 07 17:10:34 2011 -0800 |
| tree | 0784d17d80f88a0c09f9a2c4f6ecc4047af63cef | |
| parent | 52744cedeb9e968a888b29010f113847e069a5c3 [diff] | |
| parent | 6be847009696f58c42b872d7862f910ffb0d0b5d [diff] |
Merge "Merge commit 'eee12419' into manualmerge" into ics-mr1