Merge "Fix some broken Dialer tests" into lmp-mr1-dev
tree: 9aef8d6e1dc26bcdf2e846b5334f94b759f8a7ef
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags