am 9426a38c: Merge "Make Up button in filmstrip go to Gallery." into gb-ub-photos-carlsbad

* commit '9426a38c2a3ea7f54f35a202dc8aa83fa0cffa63':
  Make Up button in filmstrip go to Gallery.