tree 009930539b65e7bbd74f5bf68f66a1b5388c1e0f
parent 12087a11e9ea0114ab97d93f0225a5905abbe036
parent 750c6d5f73b408db68e00181cd4d9564e180f14a
author nicolasroard <nicolasroard@google.com> 1372287911 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1372287912 +0000

Merge "Cleanup in ImagePreset" into gb-ub-photos-carlsbad