tree 10da860fcff71886af91d082e31f0e1917926848
parent b4f03cc07b13fcf95997556f1b6ab354f48e090c
parent 64e3a6d8371f13653b7cbd444e4238e564c55675
author Winson Chung <winsonc@google.com> 1414566229 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566229 +0000

am 64e3a6d8: 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 '64e3a6d8371f13653b7cbd444e4238e564c55675':