OSDN Git Service

resolved conflicts for merge of 7790a210 to master
[android-x86/packages-apps-Music.git] / res / values-zh-rCN-finger / strings2.xml
2009-08-07 Jeff Sharkeyresolved conflicts for merge of 7790a210 to master
2009-08-03 Eric Fischeram a1f26414: (-s ours) Import revised translations...
2009-08-03 Eric FischerImport revised translations. DO NOT MERGE
2009-03-27 The Android Open... Merge commit 'korg/cupcake'
2009-03-25 Eric FischerAutomated import from //branches/master/...@141869...
2009-03-25 Eric FischerAutomated import from //branches/donutburger/...@141868...
2009-03-25 Eric FischerAutomated import from //branches/cupcake/...@141866...
2009-01-22 The Android Open... Merge branch 'cupcake'
2009-01-22 The Android Open... auto import from //branches/cupcake/...@127436
2009-01-10 The Android Open... Merge branch 'cupcake'
2009-01-10 The Android Open... auto import from //branches/cupcake/...@125939