OSDN Git Service

Merge 4b999030
authorJean-Baptiste Queru <jbq@google.com>
Wed, 18 May 2011 22:33:27 +0000 (15:33 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 18 May 2011 22:33:27 +0000 (15:33 -0700)
commit59cb770434d74956d49827d90f3f0224448f64bb
tree384bd709bfdad1b99e928efef531b47d16a3d8f3
parent7aad6034e7ba135333d1ac6a8ed4acdc9a5073a8
parent99d8ed3c30677e676540d194ee5c2ce7e213b40d
Merge 4b999030

Change-Id: Ibb94ba77ec8588f5e7636cf6a038b143e3dcb2bd