OSDN Git Service

Merge from cupcake, manifest suitable for master after cupcake gets merged in
authorJean-Baptiste Queru <jbq@google.com>
Fri, 19 Dec 2008 20:22:57 +0000 (12:22 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Fri, 19 Dec 2008 20:22:57 +0000 (12:22 -0800)
1  2 
default.xml

diff --cc default.xml
Simple merge