OSDN Git Service

resolved conflicts for merge of efddd2c5 to master
authorDianne Hackborn <hackbod@google.com>
Tue, 5 Oct 2010 21:06:01 +0000 (14:06 -0700)
committerDianne Hackborn <hackbod@google.com>
Tue, 5 Oct 2010 21:06:01 +0000 (14:06 -0700)
commitee3433bc581a9bb29dce1209d318df12f4dae909
tree54a89c2537930eb45ee1305dbd5d6b212767ad7e
parent7da3f9f51e5c9e51680cf3ee9954301d97d1db0e
parentefddd2c5b205445303a7054b3b2bd82c52858984
resolved conflicts for merge of efddd2c5 to master

Change-Id: Ida5785a4b936ed485ee6f895cbe994acf5b37626
samples/ApiDemos/AndroidManifest.xml
samples/ApiDemos/res/values/arrays.xml
samples/ApiDemos/res/values/strings.xml