Merge "Fix the unintentional behavior change"
tree: bd4a577ee6f9cd022f0051428205e43fbb31e467
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk