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

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