OSDN Git Service

Merge (ignore) from open-source master tree
authorJean-Baptiste Queru <jbq@google.com>
Tue, 31 Aug 2010 20:08:11 +0000 (13:08 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 31 Aug 2010 20:08:11 +0000 (13:08 -0700)
commit97b06ef7ddf66dae500e94b55d943cad61d28ae7
tree6fa41d8b762ca971f2cc7bb11fe2396082245eee
parent994b68f5c7d637d2945c06260fe35b266c10379d
parenta1727092595a65e4dd9d9a6bae3778ad8c31d77f
Merge (ignore) from open-source master tree

Change-Id: Ie735c3282ddc17c1e28e1069b714f3a310c221a2