| commit | 515570d42d904a2c8c5a5f795d7433000c456925 | [log] [tgz] |
|---|---|---|
| author | Guang Zhu <guangzhu@google.com> | Thu Nov 12 10:43:42 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 12 10:43:42 2009 -0800 |
| tree | a25c183b9ae2c75fb2c0c3dc5002a65928e1bd17 | |
| parent | 8016c951b9c9eb2f573280bef9916546fb748c07 [diff] | |
| parent | cb968a46f9ead302ee18585ed030b43043361704 [diff] |
am 3b8a1b35: am ea48cd6d: Use a diff that ignores trailing whitespaces to get by some layout test failures. Merge commit '3b8a1b3513bae8fc0846d52121d243bec7cb65b8' into eclair-mr2-plus-aosp * commit '3b8a1b3513bae8fc0846d52121d243bec7cb65b8': Use a diff that ignores trailing whitespaces to get by some layout test failures.