am 60b76533: Merge "Move photo gadget to the new gallery." into gingerbread

Merge commit '60b765330cc496b5ebac87ae7772b136045487b5' into gingerbread-plus-aosp

* commit '60b765330cc496b5ebac87ae7772b136045487b5':
  Move photo gadget to the new gallery.