Merge "Additional hack for bug:4311428, a follow up for Ieade33d7."
tree: e116bdd18706a41483af501193019d9301486516
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk