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.
tree: 1de0bdf145436d2ce71bb665124fc24871ace417
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE