OSDN Git Service

Merge from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Thu, 2 Dec 2010 15:46:37 +0000 (07:46 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 2 Dec 2010 15:46:47 +0000 (07:46 -0800)
commit0e5e799676a7a6ac79727dd815aff75957e5b094
treeda14a8b7588f525f83e49232fe8b815747c53e36
parent624ae678ef28e9abc4902bc49d7a23dbdb63f180
parent85aa83ea1fa3575d6d63a6a2b0637d44230d0b33
Merge from open-source master

Change-Id: Icc569e311600504c75304c79fa878614ac597fba