OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:15:11 +0000 (12:15 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:15:11 +0000 (12:15 -0700)
commite5412a9a9597433ae2540b390269c514c46402f1
tree34349145ea386f6b6b743c383d7aa9e7f68bd146
parenta811d7a8e638ca49aee704c613cb9f1e03c3698d
parentf29c214d6ad97f9a5348407cc66a58aec2228ca9
Reconcile with jb-mr1-release - do not merge