OSDN Git Service

merge from donut
authorJean-Baptiste Queru <jbq@google.com>
Thu, 3 Sep 2009 21:12:47 +0000 (14:12 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 3 Sep 2009 21:12:47 +0000 (14:12 -0700)
1  2 
build/tools/make_windows_sdk.sh
samples/ApiDemos/res/values/strings.xml

Simple merge