tree b6f7c3e9ae612ed8abda85a0123067d23aa1a91b
parent 8d3445517db4c3456f76e42f4070dd4b512faad3
parent 6d23f4c77fde7ddf70e0edd48f46cc22b7f7320e
author Angus Kong <shkong@google.com> 1369333524 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1369333525 +0000

Merge "Refactor to add FilmStripView.Controller." into gb-ub-photos-carlsbad