OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:19:30 +0000 (12:19 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:19:30 +0000 (12:19 -0700)
commit9ef024ec8ae0318c89cc65dc0591aa40695393fc
tree3d6d537b1187b7cb79d36ba395d1fe3f446a3042
parent02b95105754b1859a97e234b79f41489a4677c20
parentf67623632a545bd9ca1d8afefc3dd0789eaba6b3
Reconcile with jb-mr1-release - do not merge