Merge "Fix a bug with the string pool."
tree: f1eac790bbb8b075e0136ddf979e6196d8305dda
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk