tree 5bbabe8d00b0db6304e64593de9efb1dc8a2e879
parent f818028e5c78d85bdacd06a6161543d13b42da45
parent 208262085feca3d7f6a9606b21745323f9e88418
author nicolasroard <nicolasroard@google.com> 1379350163 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1379350163 +0000

Merge "Fix flickering while editing" into gb-ub-photos-carlsbad