tree 26e99ce58f1a9b9872c33904724f45cd6927496c
parent 8d2c6b830131a3d2e6ec7f2f8158b37506403dbd
parent de84c22cf14f8005002af473f19ff0244d520f6c
author Doris Liu <tianliu@google.com> 1377905418 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1377905418 +0000

Merge "Measure all children to ensure correct layout position" into gb-ub-photos-carlsbad