tree 19f8b0d7626f5d979b21a03817274a850f3de46a
parent a899936005c1f8df7a9a4573a99bd3c14b63dd7e
parent ac23f408a87437685d3d4a2b4005b981ca01e425
author The Android Open Source Project <initial-contribution@android.com> 1351700550 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351700550 -0700

am ac23f408: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'ac23f408a87437685d3d4a2b4005b981ca01e425':
  Cap launcher swipe animations to max duration