Merge "Fix DialerSettingsActivity so it does not crash pre-M." into ub-contactsdialer-b-dev
tree: 1f0a1780a8935566fb45ac35c02ef935315f5da2
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags