tree 2e10c19b1150255463b94a35619fe0db59da6adc
parent 68e4ae64380e2c9843faaec63b98ba51479c0f11
parent 78cabea71ab108b1de80a0e63cc16aec6bd64fb2
author nicolasroard <nicolasroard@google.com> 1354165230 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1354165230 -0800

Merge "Fix flashing in geometry panel" into gb-ub-photos-arches