am dca7c008: merge from froyo-plus-aosp

Merge commit 'dca7c0080e82fd7a29e6eebbba507122d73a9d32'

* commit 'dca7c0080e82fd7a29e6eebbba507122d73a9d32':
tree: 03e976e739dc3dce00638a6edf9626c29639dce7
  1. dictionaries/
  2. java/
  3. native/
  4. res/
  5. tests/
  6. Android.mk
  7. CleanSpec.mk