am 90f2ee94: am 41f7d2d9: Reconcile with ics-mr1-release

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