am 23c45bac: Reconcile with ics-mr1-release

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