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
..
2010-05-24 15:02:28 +09:00