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

* commit '6e9123a658d4ed0dcb80dd376c676f043e2f4baa':
  Fix flashing in geometry panel
tree: d78eb9ff9ed13c310c08049f7f8a5bcc17253adf
  1. actionbarsherlock/
  2. res/
  3. src/
  4. src_pd/
  5. tests/