tree d7cfeec096edcccc969a718e43fc2a2b7411845b
parent 8fdacf3ad92cace4a9b50d0d21d7f2b193771e5c
parent 049abba5a2634f37f73d2abe83906cc71b8ad3f7
author Adam Cohen <adamcohen@google.com> 1321917243 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321917243 -0800

am 049abba5: Merge "Fixing PagedView bad snap-back decisions" into ics-mr1

* commit '049abba5a2634f37f73d2abe83906cc71b8ad3f7':
  Fixing PagedView bad snap-back decisions