tree 29b7d6dc3ccc55c7d782749207436fca81b20899
parent c0c6f058d464be3e4d6925239bcabc5b56fbce80
parent c870104ac3768bd528798eb4646c3b075757c5ff
author nicolasroard <nicolasroard@google.com> 1383356250 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1383356251 +0000

Merge "Disable geometry button if tiny planet is here" into gb-ub-photos-carlsbad