am 095f112b: Merge "Fix incorrect photouri on call shortcut" into klp-dev

* commit '095f112b1bd44ac6d1d2fd80b515a76ea40ca586':
  Fix incorrect photouri on call shortcut
tree: e812ed0c3a53e8c1d05dfd2ea97d5bcb8d348bde
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags