From: Doris Liu <tianliu@google.com>
Date: Fri, 30 Aug 2013 23:32:53 +0000 (-0700)
Subject: am 750e73c4: Merge "Measure all children to ensure correct layout position" into... 
X-Git-Tag: android-x86-6.0-r3~1684^2~44^2~198
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f55555e0;p=android-x86%2Fpackages-apps-Camera2.git

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

* commit '750e73c4a4b04a5695540d3c982774662307b58e':
  Measure all children to ensure correct layout position
---

f55555e0ad5aad15813ce2c2fb57552fdb6c01b2