tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent e6e924ec725f978078cfbcaa4c6022ffb99b4bd7
parent 88f2f8fb43951c747e45080b010dd782216a65ba
author Winson Chung <winsonc@google.com> 1392410186 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410186 +0000

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 '88f2f8fb43951c747e45080b010dd782216a65ba':