am 0993a89b: am 1c0f94c5: Reconcile with ics-factoryrom-2-release

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