Merge "Fix subtype settings activity string"
tree: 751d0f670f783c77fc0de92fc70b9d4671b14ad3
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk