OSDN Git Service

Merge from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Mon, 31 Jan 2011 23:14:41 +0000 (15:14 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 31 Jan 2011 23:14:54 +0000 (15:14 -0800)
commite29ef594e6836cdeee09de51f3a4b9af11cdabff
tree8ade8071261eec6c58fcb94456d6dcebc0711005
parent2039512c305c8fb21cdce1e338fd36ebeec8ec85
parent00aef60ada2a0826036515a21df52020b25af7c1
Merge from open-source master

Change-Id: Id74236b5a2b2717bbe45c684573106555c7d9ad2