tree cba62d0d64153aa2169651696bc238591341d679
parent 538315b9c83362f0a8b2547c139c41f473b5535c
parent 4bac25fd058b41445bc4c71c95ffe39c7e8bd5ea
author Adam Cohen <adamcohen@google.com> 1414085407 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085407 +0000

am 4bac25fd: am 67910d4a: am 8ac3ed8e: am 849d1201: Merge "Finished getting rid of mPageSpacing" into jb-ub-now-jetsonic

* commit '4bac25fd058b41445bc4c71c95ffe39c7e8bd5ea':