Commit Graph

155 Commits (4f57a634d34d29705d8abc1c605936b086277461)

Author SHA1 Message Date
satok 53393240e8 Merge commit 'goog/master'
Conflicts:
	native/Android.mk
2010-05-07 19:57:51 +09:00
Kenny Root 0dfa3e6dad Import revised translations
Change-Id: I1050cb361860cbea36bba762d37b4558dee8cecb
2010-04-27 14:30:47 -07:00
Ken Wakasa 1cf0ce74e8 Make this sandbox buildable under the froyo tree using symlink under vendor/google/apps.
Change-Id: Ia83a8e27d7a44a3a4dcf21b7a0bf0ab814f106ea
2010-04-07 18:58:46 +09:00
Kenny Root 1866d9ec83 Import revised translations
Change-Id: Id1db465dcf22f183bbf365f25905f408b51709f6
2010-03-17 22:16:48 -07:00
Amith Yamasani 07b1603a3f Don't let the native code target be included twice when unbundling.
Move java code to a different directory so that the unbundled
version doesn't try to compile the native code again.

Change-Id: I05cf9e643824ddc448821f69805ccb0240c5b986
2010-03-09 15:01:09 -08:00