| commit | 52c98b41d6fb5e12ed2e5eaccb75c0b7013649c6 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Tue Mar 01 10:58:45 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 01 10:58:45 2011 -0800 |
| tree | 8353c6014b6abce66d60b96e2248a9fb459fccda | |
| parent | 8366b2331748da6371deb63271bc2e955fd62c92 [diff] | |
| parent | 2d5ed07940bc1966d4b55999634f05515e7fe197 [diff] |
am 2d5ed079: (-s ours) am 7b972755: (-s ours) am edbd6139: Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread * commit '2d5ed07940bc1966d4b55999634f05515e7fe197': Merge 1911a6f7 into gingerbread. do not merge.