tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent c1e5069323a83c7d23e45ce70fa4bf600b4d9ad6
parent 511ced177b95a1f301af6ff24d4868af6772d831
author Winson Chung <winsonc@google.com> 1392411560 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411560 +0000

am 511ced17: am 977b2f80: am 88f2f8fb: am 1d220c31: am 8bcdff50: Merge "Ensuring that we offset cell items by their destination cell padding. (Bug 10881814)" into jb-ub-now-indigo-rose

* commit '511ced177b95a1f301af6ff24d4868af6772d831':