tree 341b7e81a92150c77c4abc7a335cd2d08598b0bf
parent 5e388fd3f5e9e80f8a484b5ec703139cb60f685f
parent 6e9123a658d4ed0dcb80dd376c676f043e2f4baa
author nicolasroard <nicolasroard@google.com> 1354165335 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354165335 -0800

am 6e9123a6: Merge "Fix flashing in geometry panel" into gb-ub-photos-arches

* commit '6e9123a658d4ed0dcb80dd376c676f043e2f4baa':
  Fix flashing in geometry panel