| commit | fff6a88ccc6289ab31dfc7dc83bc35baef19dede | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Tue Mar 15 12:01:24 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 15 12:01:24 2011 -0700 |
| tree | ac7000b02128e4726b21147aa7157e921efc4969 | |
| parent | b2389eaada336b3184593ec880ecd0f587b5710d [diff] | |
| parent | 9cb1acda89919a46583444f788f4808fecd5d78d [diff] |
am 9cb1acda: (-s ours) am 405cb570: (-s ours) am 14e1f523: Merge "Merge c12b4093 from honeycomb. do not merge." into gingerbread * commit '9cb1acda89919a46583444f788f4808fecd5d78d': Merge c12b4093 from honeycomb. do not merge.