am 2549ce27: am df2fed2b: Merge "Fix a bug that would end up in memory corruption" into ics-mr0

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