OSDN Git Service

merge from gingerbread
authorJean-Baptiste Queru <jbq@google.com>
Sat, 15 Jan 2011 01:09:06 +0000 (17:09 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Sat, 15 Jan 2011 01:09:18 +0000 (17:09 -0800)
commit27016763c7c0e568fb8eb26ab3d30282f027a72d
treed01c0b8f1387daca7758de6dc23898ba1ef458b9
parent7e27c8e15507d62a0ac0b094bc7cfca15f6cc509
parent9ac1e65fadbc63aa3890cd5ed8b4593eb7faaeb5
merge from gingerbread

Change-Id: I05a6bed8b7275114ce545a7a45f2e13bf5469ec0