tree d78eb9ff9ed13c310c08049f7f8a5bcc17253adf
parent 2f1aaf7b3d7c8a0b6acd8f7355794a9244ba96e4
parent ad8bc48985756ba94797584eafcfb33560c08076
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