tree 5cd853cd82a10c0186f44afe3eefe2801af7cf85
parent 66cfdf11508addf60891c00f4f0752fb90cfe5fb
parent 6aae9177ac432df82971facab214b365e92b4a04
author Angus Kong <shkong@google.com> 1378790157 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378790157 -0700

am 6aae9177: Merge "Fix images being off-center in filmstrip." into gb-ub-photos-carlsbad

* commit '6aae9177ac432df82971facab214b365e92b4a04':
  Fix images being off-center in filmstrip.