am 2f45dbfc: (-s ours) am ace15025: Merge "Follow up change of I8b38e280 (DO NOT MERGE)" into gingerbread

Merge commit '2f45dbfc0d393fdb661bb42038137312e0d4b5f2'

* commit '2f45dbfc0d393fdb661bb42038137312e0d4b5f2':
  Follow up change of I8b38e280 (DO NOT MERGE)
tree: 7cec0e718ac7692e8dd684fc32579ea32687765b
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. Android.mk
  6. CleanSpec.mk