tree f37f5e21f670e611cba6bea9191ba66f1591e418
parent 2598a5c89fb8c0a9315097657ac688f2b28e5ae8
parent 5a418c771db08b1660095dfb712d2f159f700968
author Romain Guy <romainguy@google.com> 1337387398 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1337387398 -0700

Merge "Gallery, we need to talk..." into jb-dev