tree a0b809960bba40da033c63e19099b361115d336e
parent f91b03fd66f37fcabe3581011a58b37977ff2922
parent e78541f2edf2f02660c34660114e76d53b32ab8b
author Angus Kong <shkong@google.com> 1369788425 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1369788426 +0000

Merge "Add UI for insertion in FilmStripView." into gb-ub-photos-carlsbad