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

* commit '61fcb22e417d795802906fe2de447de2043b073d':
tree: e812ed0c3a53e8c1d05dfd2ea97d5bcb8d348bde
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags