tree 003146175dbff72bcd5c2ed5a2c55bfe20c119f7
parent 27a265c696064fd5fe4cdc1835e6ef9b2b141d8a
parent ba1ba19c27e90694f74985b37b7bcaea6c023621
author nicolasroard <nicolasroard@google.com> 1349074716 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1349074716 -0700

Merge "Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now" into gb-ub-photos-arches