am 41f7d2d9: Reconcile with ics-mr1-release

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