tree 36ad8373649f125b9614db8ef80efc0c0bdb5a52
parent d483ca1f81704f7a1c6a310bd2ba289aef2ffb65
parent f7758b6cc5ab00ad3955bf9c98af76559644a477
author Doris Liu <tianliu@google.com> 1370644353 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1370644353 +0000

Merge "Add enable/disable swiping to filmstrip" into gb-ub-photos-carlsbad