am 7d849f8a: am 2d6a0c68: Merge "Fix proguard flag file dependency." into gingerbread

Merge commit '7d849f8a2aeadb5b8a97b42fe5748dced3051126'

* commit '7d849f8a2aeadb5b8a97b42fe5748dced3051126':
  Fix proguard flag file dependency.
tree: e9c9dc30bf6a669872932c2e9e230603e874403d
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. Android.mk
  6. CleanSpec.mk