satok 53393240e8 Merge commit 'goog/master' ... Conflicts: native/Android.mk		2010-05-07 19:57:51 +09:00
..
res	Merge commit 'goog/master'	2010-05-07 19:57:51 +09:00
src/com	Merge commit 'goog/master'	2010-05-07 19:57:51 +09:00
Android.mk	Fix the sandbox build & get rid of ICU dependency.	2010-04-20 17:55:53 +09:00
AndroidManifest.xml	Fix the sandbox build & get rid of ICU dependency.	2010-04-20 17:55:53 +09:00
MODULE_LICENSE_APACHE2	Clarify licensing	2010-04-05 09:47:36 -07:00
NOTICE	Clarify licensing	2010-04-05 09:47:36 -07:00
proguard.flags	Don't let the native code target be included twice when unbundling.	2010-03-09 15:01:09 -08:00