Merge "Fix an NPE in recapitalize" into jb-mr2-dev
tree: 47c10baa0763e157e85675a668afabfd3b734e22
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk