am b690c039: Merge "Optimize layout"

* commit 'b690c039271ad5ec5551cec4b73e796e9522ee45':
  Optimize layout
tree: 5716db2939d83aa7bdbd34e8a5c49717e3cc81a6
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk