am 8a961759: (-s ours) am 86ade472: Merge "Initialize SubtypeLocale from Settings (DO NOT MERGE)" into jb-dev

* commit '8a96175936e6f4cc02e4fc3cd3ae6759f0b1f86e':
  Initialize SubtypeLocale from Settings (DO NOT MERGE)
tree: 1534d2291f3eff9256695f1b8a46151aed356a69
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk