tree c46821d15501b5e89047906fdadd6e29a6e5587c
parent b8e2ab31ce0584505502d6c438d1a781a3a26a3b
parent a3c1fb69e51861a11b79c397e63cbf3acd52ba5f
author nicolasroard <nicolasroard@google.com> 1372209897 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1372209897 +0000

Merge "Cleanup ImagePreset to remove special-casing for borders" into gb-ub-photos-carlsbad