am 5583cb0a: Merge "Followup TBR in I87060049" into gingerbread

Merge commit '5583cb0afcb2104a10689a1c60c051a99e98678b' into gingerbread-plus-aosp

* commit '5583cb0afcb2104a10689a1c60c051a99e98678b':
  Followup TBR in I87060049
tree: e3f30f473c32573abc80bd924a9bdc88954d6e72
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. Android.mk
  6. CleanSpec.mk