am 962c9f05: Merge "Small cleanup"

* commit '962c9f059a11a128a5547c877d4af485af0019b4':
  Small cleanup
tree: 8a6599f4d093dedf7de3faf80614446eb99e320a
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk