Merge "Corresponding to TBR of Id2b0b974" into gingerbread
tree: 2b39b32080e0b8301d5b8278969b53fc8fcb3336
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. Android.mk
  6. CleanSpec.mk