OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorJean-Baptiste Queru <jbq@google.com>
Tue, 26 Feb 2013 22:02:57 +0000 (14:02 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 26 Feb 2013 22:02:57 +0000 (14:02 -0800)
commit22c22cf7e0ae42b6c4fa585341459d9aa3b0c4be
tree90ab13f580e0f575c8e29c6a6ed3a079ff86bf5c
parent9f2971d1f36e0bffd79033e946ff1378e6ceb309
parent3f906009dbb20057c6f6f45069c32d078bd3d27f
Reconcile with jb-mr1-release - do not merge