am 1a58855d: am caaac8fc: Reconcile with ics-mr1-release

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