Merge "Fix incorrect photouri on call shortcut" into klp-dev
tree: 25934f07b00ac4988e557a8f85d9026bdd58a63a
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags