Merge "Fix build breakage due to bad manual cherry-pick" into ub-contactsdialer-b-dev
am: f9c47fc58a

* commit 'f9c47fc58acc9147962ca853018f3610b95c0824':
  Fix build breakage due to bad manual cherry-pick
tree: efabd95f6cc6969605b15c98aac5203c77cfe813
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags