| commit | b259c04d4321536ef9f5cc9b55079d3bd450eef7 | [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 | 9d87ecb453169c4ff09f2303a4b72fed29116b24 | |
| parent | fbb09ea84f7a9df94358f05f4e680cb363bae663 [diff] | |
| parent | b50c768a8a9662033185e063f9e433971c1b6e2d [diff] |
Merge "Merge commit 'eee12419' into manualmerge" into ics-mr1