am 25cbe892: Reconcile with ics-factoryrom-2-release

* commit '25cbe8924a7ec5c45914c8818b5ad7b39e1f6103':
  Fix a bug that would end up in memory corruption
tree: d515bd30426cd2f9c6f41daef212e8429a89682c
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk