| commit | 1571239c21fc4be7fd3c8db6ff1b8dc22f4d7e6f | [log] [tgz] |
|---|---|---|
| author | ztenghui <ztenghui@google.com> | Mon Aug 19 16:50:34 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Aug 19 16:50:34 2013 +0000 |
| tree | eee98f09ae1a776afdf9df36ae3a8c6d6e9d498a | |
| parent | e9d3428f605ef90efbf94c18abf5bba3ac64d870 [diff] | |
| parent | 6b9203214d828d72758943aca55adceab684a862 [diff] |
Merge "Add the trim functionality back to FilmStripView" into gb-ub-photos-carlsbad