OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:23:31 +0000 (12:23 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:23:31 +0000 (12:23 -0700)
commit469dbc0aec2b85c3ac9947f1d1572c27bd5ce99e
tree946cafa6ce9860f2b486b6116658734553db345c
parentc04808a532b0421fded05eecf5d843c45b7eb407
parent6a73c51fbf0dfacedc21614b112a1a3f26820afb
Reconcile with jb-mr1-release - do not merge