tree 8cce512b58def27ca7bc24d3802c6d35076da6b5
parent 7432a1ca21a6a6a0763b5db02607ccde78ebf857
parent 04cb48f465e7a9382efa9438ef9826ba5bcb416d
author Winson Chung <winsonc@google.com> 1336349469 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336349469 -0700

am 04cb48f4: Merge "Adding workaround to allow shortcuts to skip the launch animation. (Bug 6447372)" into jb-dev

* commit '04cb48f465e7a9382efa9438ef9826ba5bcb416d':
  Adding workaround to allow shortcuts to skip the launch animation. (Bug 6447372)