OSDN Git Service

Merge from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Thu, 2 Dec 2010 15:55:02 +0000 (07:55 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 2 Dec 2010 15:55:06 +0000 (07:55 -0800)
commit40eade14bb87d24903588de04449fdfe2e1795cb
tree22cf7f66ad807234c28cf352552e9a7e50cfb5ad
parent077bc4ac019ad33abd613448e11d3ad501218991
parente1de3f390e7be3f82fa5e3e5bf6d6c8cc8414091
Merge from open-source master

Change-Id: Ie25bbfbf12fa8902d9ba82cf2d4ed4c60d439e39