Merge "Fix DialerSettingsActivity so it does not crash pre-M." into ub-contactsdialer-b-dev
am: 24efa3aa0f

* commit '24efa3aa0f178067c2012c91a0b567e73aa3d157':
  Fix DialerSettingsActivity so it does not crash pre-M.
tree: 6445f433d9f365ca7a15fa6f395fad2a612fda28
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags