Merge "Fix additional subtype id calculation"
tree: 03d0628f6c95e1d50e8afb493f4bd2ab57536488
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk