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

Merge commit '1274cd160f81d7a59828e0dbe66d87dfbe87c544'

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