tree dd657c1b718390cc08e776d63f6c8c2cfa771247
parent 22c824de0d52f9f19398529fee14a3aeb41f04b0
parent 1a7821c03e800cf616f567326b8e2e197f0dcd27
author Sascha Haeberling <haeberling@google.com> 1375397452 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1375397453 +0000

Merge "Adds back the PhotoSphere View icon in filmstrip." into gb-ub-photos-carlsbad