OSDN Git Service

merge from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Tue, 1 Sep 2009 15:27:45 +0000 (08:27 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 1 Sep 2009 15:27:45 +0000 (08:27 -0700)
commit9dc454b1b175af7f94b264295165d84e0abc8f80
treea38877e8c9b19ae3f07f0b0c05c31ef0afc46ad4
parent38b43f9cdac13f018bf23908d02d087b66643af6
parent2748afc2714e320dfe4c8b9ad2d74ed8222e274d
merge from open-source master
samples/ApiDemos/res/values/strings.xml