tree 720cfadc7d601f079b482a3ea623877590ad1568
parent e8fa03680a2499f76db38a3701cf287b050a0a5f
parent c1627906db42b824cb76953d373cd33120d19db9
author George Mount <mount@google.com> 1349551508 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1349551509 -0700

Merge "Move LightCycle undo to settings area." into gb-ub-photos-arches