tree b575b0ff56366681a194aecffbeab031413c1c37
parent 9895f144631ef60056da2bcc3cb911faf9c6b3b1
parent 9f02c87cfb5039a72f516ea5edc0378c45ac5779
author Angus Kong <shkong@google.com> 1369094641 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1369094642 +0000

Merge "Fix jitter in FilmStripView." into gb-ub-photos-carlsbad