Merge "Follow up change of I8b38e280 (DO NOT MERGE)" into gingerbread
tree: ad149dd52d9b7d521945e96d36fcc819566eb0ee
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. Android.mk
  6. CleanSpec.mk