OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:20:16 +0000 (12:20 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:20:16 +0000 (12:20 -0700)
commitb25a2fcfae02ff802b81978ec82f0da8d2735d77
tree6b73b50d39ea0317cf5b2866f7492a2290ada6e2
parent5a484b753cc72d6a50c1dd3bbf68b3403c741a3a
parentebc42af458e519e930d0840e6775a31ee57a54be
Reconcile with jb-mr1-release - do not merge