Merge "Fix some proguard rules to fix tests" into ub-contactsdialer-a-dev
tree: a9b5fb49c6328319bffb90932f99d5d96f29f1f5
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags