OSDN Git Service

Merge from master
authorJean-Baptiste Queru <jbq@google.com>
Tue, 14 Feb 2012 18:04:08 +0000 (10:04 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 14 Feb 2012 18:04:12 +0000 (10:04 -0800)
commitcb4c6ef4d79d5f694a1fbaeca69d42c3c68289fd
tree5954c822b4906fd1740479c3b554e36ef7bd98dc
parenta9360fa5f64add5eb8e3276f0d8191141a4ec230
parent944380f980bcadccae07ce1182c9be29095dadfe
Merge from master

Change-Id: I62479982edbb2229f84d20a581cccb703bdfc87b