Merge "Fix IllegalStateException in Dialer" into lmp-dev
tree: 2d7f0b9e5827e1cce8f9d571389ddcf80fe01b15
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags