tree cba62d0d64153aa2169651696bc238591341d679
parent 447d9c3b56b0f688f675096a687015007055f265
parent 157b263ef9fd463beca54be2ed4267ae022a9542
author Adam Cohen <adamcohen@google.com> 1414085543 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085543 +0000

am 157b263e: am be71ebfb: am f833fefb: Merge "Don\'t load items which exceed the grid bounds" into jb-ub-now-kermit

* commit '157b263ef9fd463beca54be2ed4267ae022a9542':