tree b4e819a5e883eb7809da750f75d6f91ff8ea8f9e
parent f048c6ec3cb5d54ababe2cce396740332f478fc6
parent 9ad005639e1698c94674cdfadf3ae342fb56c9b5
author Michael Jurka <mikejurka@google.com> 1337049682 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337049682 -0700

am 9ad00563: Fix issue where Google Voice shortcuts would disappear

* commit '9ad005639e1698c94674cdfadf3ae342fb56c9b5':
  Fix issue where Google Voice shortcuts would disappear