tree 5104e085fa98052212916052116cc9f2b90566f2
parent 4719963c86f40a56d0b7682d9d43ebd36a6b2f56
parent ea48cd6dd4e64bcb5c840a12fe052f704510e01c
author Guang Zhu <guangzhu@google.com> 1258050563 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258050563 -0800

am ea48cd6d: Use a diff that ignores trailing whitespaces to get by some layout test failures.

Merge commit 'ea48cd6dd4e64bcb5c840a12fe052f704510e01c' into eclair-plus-aosp

* commit 'ea48cd6dd4e64bcb5c840a12fe052f704510e01c':
  Use a diff that ignores trailing whitespaces to get by some layout test failures.