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

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