tree 72b19129bcb8a89793d087a805be804002955dc2
parent 203eb404a7cd6a80397535e63d22b3772939f03d
parent f1f5186f7d3fd8bf35009d9e65a43914c664d82b
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