Merge "rename define" into jb-mr2-dev
tree: 02470bc68b534e60f3c9cb35def8b63dbf70060e
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk