tree 78f6bda8af730d282e5c89ee49f284ed214026a9
parent 599730cf777402d183afa5b648ea1c8c1fab8118
parent dccd6d91ca82225395af470595e4ffb8734dac1a
author Jim Guggemos <jimg@google.com> 1354650507 -0700
committer Jim Guggemos <jimg@google.com> 1354650553 -0700

Merge 'goog/jb-ub-now-carmello' into frameworks/opt/photoviewer

Change-Id: I4a338a8cf6650db88dfa1914dd4c0fa63c841d89