Merge "Combine InCallUI & Dialer (part 3)" into klp-dev
tree: feebce1c9bbcc55006e6020da8094efc4a04b48c
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags