Merge "Fix the subtype id of the additional subtypes"
tree: a4224406a239dee299342f4acc5b2f3d1eeb025f
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk