OSDN Git Service

Merge "Add the trim functionality back to FilmStripView" into gb-ub-photos-carlsbad
authorztenghui <ztenghui@google.com>
Mon, 19 Aug 2013 16:50:34 +0000 (16:50 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 19 Aug 2013 16:50:34 +0000 (16:50 +0000)

Trivial merge