OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:18:53 +0000 (12:18 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:18:53 +0000 (12:18 -0700)
commit89d125ecbdbbeba975bd8c5cf5055558ddf35a4a
tree5862b78d667371e87353d024d877a07edf11fa94
parent86c93df1d626c42147db2f2a6dfb5dcad83477ec
parent279731e733c27fd8dfb24d740c05f9ba1b4f8db0
Reconcile with jb-mr1-release - do not merge