satok eca9637390 Merge remote branch 'goog/master' into merge4 ... Conflicts: java/res/values/strings.xml Change-Id: Iee1abd3c11e07f681b9f7a280c3621a0c33ffc90		2010-09-07 22:37:39 +09:00
..
strings.xml	Merge remote branch 'goog/master' into merge4	2010-09-07 22:37:39 +09:00