| commit | da23ee3c2247900ed7deb509bbd17573104e0715 | [log] [tgz] |
|---|---|---|
| author | Guang Zhu <guangzhu@google.com> | Thu Nov 12 10:47:40 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 12 10:47:40 2009 -0800 |
| tree | e7640415b5292d49bdec0aa9f21bdee1009a9b7d | |
| parent | c20da0b8db63f8b66d068748dc48f9002dede7a1 [diff] | |
| parent | 640b44a070951696bbeb39e0ddac1c7aa861e35d [diff] |
am 640b44a0: am 3b8a1b35: am ea48cd6d: Use a diff that ignores trailing whitespaces to get by some layout test failures. Merge commit '640b44a070951696bbeb39e0ddac1c7aa861e35d' * commit '640b44a070951696bbeb39e0ddac1c7aa861e35d': Use a diff that ignores trailing whitespaces to get by some layout test failures.