satok 53393240e8 Merge commit 'goog/master' ... Conflicts: native/Android.mk		2010-05-07 19:57:51 +09:00
..
strings.xml	Merge commit 'goog/master'	2010-05-07 19:57:51 +09:00