tree 6f14709d3ee1320421593993dfce44de02414972
parent f26493f5a14449bd9f9630b81f0fec802b4fd943
parent d02402cb141d5f7838a10a400926e0dfcee2783f
author Daniel Lehmann <lehmannd@google.com> 1337122735 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1337122735 -0700

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