am a777a86f: Merge "Simplification (A2)" into jb-mr1-dev

* commit 'a777a86f4b311ccdf1443faf0d1759e445ef138e':
  Simplification (A2)
tree: 61d368bea1f398891b7ff3c7c74f0918b406f38c
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk