OSDN Git Service

Merge from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Thu, 2 Dec 2010 15:49:06 +0000 (07:49 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 2 Dec 2010 15:49:11 +0000 (07:49 -0800)
commit5d1bf1f6b21848ec1086d59111306d2d4a4b5fc3
treecae8616c2543778049925ebefa67739bd44795cd
parentd844e1f030065939140c0fa927fe89b367d5bd40
parentea266fcd2c736e4e907527f4e20b38f41a17640c
Merge from open-source master

Change-Id: I22fd2b911ff05cd0d01fe151b18d64b4ac98e547