tree 6f14709d3ee1320421593993dfce44de02414972
parent 2a2b2d028aaf6a022e621f21e98e20b51d877b78
parent a8859a0a6b9787b156ef8ae7eba5c9fe1a5cd453
author Daniel Lehmann <lehmannd@google.com> 1337122990 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337122990 -0700

am a8859a0a: Merge "Preset type; contact shortcuts are now launched w/o provider invocation" into jb-dev

* commit 'a8859a0a6b9787b156ef8ae7eba5c9fe1a5cd453':
  Preset type; contact shortcuts are now launched w/o provider invocation