| commit | 2d5ed07940bc1966d4b55999634f05515e7fe197 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Tue Mar 01 09:12:15 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 01 09:12:15 2011 -0800 |
| tree | cc85d2f589b4d83f9fbb06559bef035c38641ad6 | |
| parent | 23fe005900aab2955052e0c9dc36ca05ea351a1a [diff] | |
| parent | 7b9727558b42aecacd0ea63cf3b3c89e9bfd9e9b [diff] |
am 7b972755: (-s ours) am edbd6139: Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread * commit '7b9727558b42aecacd0ea63cf3b3c89e9bfd9e9b': Merge 1911a6f7 into gingerbread. do not merge.