Merge "Fix build breakage due to bad manual cherry-pick" into ub-contactsdialer-b-dev
tree: efabd95f6cc6969605b15c98aac5203c77cfe813
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags