tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 9e40582f7daa55814a0d74061ac7a404985ad1ab
parent 977b2f806546cc1baf649dcaae207ee0c6bad0bc
author Winson Chung <winsonc@google.com> 1392411091 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411091 +0000

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 '977b2f806546cc1baf649dcaae207ee0c6bad0bc':