OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:21:38 +0000 (12:21 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:21:38 +0000 (12:21 -0700)
commit63da0db6333796d7b3a94af55de58039cea94b8d
treebd1fd1fd65d6129a0b17f83c154266b9394d7576
parentc0c7418a7275131786a296c006864fcca3b559e9
parentccddd6f97d953ec4a0cc5ef2ac7fc981f43320cd
Reconcile with jb-mr1-release - do not merge