satok 3e5b8b3520 Merge commit 'goog/master' ... Conflicts: java/res/values-de/strings.xml java/res/values-it/strings.xml		2010-05-24 15:02:28 +09:00
..
bools.xml	Don't let the native code target be included twice when unbundling.	2010-03-09 15:01:09 -08:00
donottranslate.xml	Don't let the native code target be included twice when unbundling.	2010-03-09 15:01:09 -08:00
strings.xml	Merge commit 'goog/master'	2010-05-24 15:02:28 +09:00