am 32407e61: am 1b841f56: Reconcile with ics-mr1-release

* commit '32407e615bbacb6bf21161a4d95a77961a411e81':
tree: 6e432b9084750e67bb3fdc2c12978e84f3a153fc
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk