tree e813ad9db8bfebe81479a33b53f14ca54b6fe46f
parent ab3c061b9253294db4f09a7490066cd84e6d8a3f
parent 9a088cb860bd79c137f5cdffe696f7645663b654
author Adam Cohen <adamcohen@google.com> 1392411180 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411180 +0000

am 9a088cb8: am c0dfb140: am e33f8259: am 5c6474da: Merge "Fix problem with where PagedView could get stuck (issue 11314889)" into jb-ub-now-jetsonic

* commit '9a088cb860bd79c137f5cdffe696f7645663b654':
  Fix problem with where PagedView could get stuck (issue 11314889)