OSDN Git Service

Merge 784515ad
authorJean-Baptiste Queru <jbq@google.com>
Wed, 6 Jul 2011 19:59:46 +0000 (12:59 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 6 Jul 2011 19:59:55 +0000 (12:59 -0700)
commitcb5529efd80bc9ae78a8ea5f16f062adda4ec368
treebd8406edf2d073901b7b44123ea49bdd93a99056
parentc99376836021e6623516cf38d42259d38e1a480f
parent784515ad93c63ce9b7add4830946f30a2792b97d
Merge 784515ad

Change-Id: I3e5b691d008e9548f43339635bafdd95bc2f56fe