am e62384fa: merge from froyo-plus-aosp

Merge commit 'e62384faeb5652761bd22edc8c1049c7cbc2aba8'

* commit 'e62384faeb5652761bd22edc8c1049c7cbc2aba8':
tree: 86886a8b00addec1f2c0b29942313c0138c02e5b
  1. dictionaries/
  2. java/
  3. native/
  4. res/
  5. tests/
  6. Android.mk
  7. CleanSpec.mk