am 5f1aecb2: (-s ours) am e07bc39a: Merge "Trim unwanted whitespace from translations.  DO NOT MERGE" into gingerbread

Merge commit '5f1aecb27d008803def36efeba9d2503035c1ac4'

* commit '5f1aecb27d008803def36efeba9d2503035c1ac4':
  Trim unwanted whitespace from translations.  DO NOT MERGE
tree: c9fde2d142c1a75364b076eff3f1bffd887f2a32
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. Android.mk
  6. CleanSpec.mk