am 65d74d19: am b3c6951e: Merge "Fix Dialer tests"

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