Merge "Fix variable type" into jb-mr1-dev
tree: d18dd6573a855558f4b6d9ff8d321d7e86382a75
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk