tree bec9f36bdcadbbb66734eb43f1c0a37b5319c5d8
parent ad7cf187bf0c11b05aa3eab7085148e0353f2af5
parent aeae1502fba8ea6d26dd10d0a111ea965ce37931
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