am b201aba6: am 8af21dc5: Merge "Add floating dialpad action button"

* commit 'b201aba69fb94c182e694aa045b2971ecd4a44c3':
tree: c2175942e3a631ad112fe6ab17da560c45fc1ae2
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags