am 9b6c525d: Merge "Combine InCallUI & Dialer (part 3)" into klp-dev

* commit '9b6c525d249e4092b9cabad573e4b37fa7aec946':
  Combine InCallUI & Dialer (part 3)
tree: ad6ce5002c6af917c1734d47c96f3c64b682f6b5
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags