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

Merge commit '2d6a0c68c29c94b492a93d06d072568d767c1e72' into gingerbread-plus-aosp

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