OSDN Git Service

Reconcile forked Gallery2
authorJean-Baptiste Queru <jbq@google.com>
Thu, 20 Sep 2012 21:15:18 +0000 (14:15 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 20 Sep 2012 21:15:45 +0000 (14:15 -0700)
Change-Id: I0fae300a6f28155e0f80096a616d34ea150240b2


Trivial merge