OSDN Git Service

Merge 42c94791 from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Thu, 4 Nov 2010 14:22:33 +0000 (07:22 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 4 Nov 2010 14:22:44 +0000 (07:22 -0700)
commitea4f07f93adb1af66831ca90926cc604dc9a79c4
tree099de02f30b1ddb6f6ef7158b3c7abc060aaaa6f
parentecf5563442cf99e44877e2617067a0cfc0d5485b
parent5f3c2b79fabd747cc1b9118f7c2947041aa34b72
Merge 42c94791 from open-source master

Change-Id: Id17a1a787b6d46c44ba39d628129a3a27f6d70be