am 7635ada2: Merge "Fix test in SubtypeLocaleUtilsTests"

* commit '7635ada2463730ab9e356922bb21cf5cf2a2716e':
  Fix test in SubtypeLocaleUtilsTests
tree: 104fde15df127c9ed532c7393aea4e6be919d4b7
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk