tree 1600f3ef43bf2437b584bf6c964ad07ce4321e4c
parent 59adc3b40b9eeba1cd0305c69a9c6ba3056db6e5
parent 9247892015dad231c5005aa021c3e3416265ed80
author Adam Cohen <adamcohen@google.com> 1337287890 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337287890 -0700

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

* commit '9247892015dad231c5005aa021c3e3416265ed80':
  Fixing regression where you can't add shortcuts