am 0025580: Implement shortcut validation in the contacts provider by re

Merge commit '0025580d46c690c97d754807c1506617f6a23d47'

* commit '0025580d46c690c97d754807c1506617f6a23d47':
  Implement shortcut validation in the contacts provider by returning a shortcut id, and
tree: 592ae0e0bdc2ff50303dd732a31da4e50b44fedb
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE