tree 1600f3ef43bf2437b584bf6c964ad07ce4321e4c
parent 68d1991e3762b971edbe0d10d17dfb8c5c6d006e
parent 7ebbfcf96a36a8bbd42e621d6e2ed97044592f2a
author Adam Cohen <adamcohen@google.com> 1337629302 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337629302 -0700

am 7ebbfcf9: am 92478920: Fixing regression where you can\'t add shortcuts

* commit '7ebbfcf96a36a8bbd42e621d6e2ed97044592f2a':
  Fixing regression where you can't add shortcuts