Kenny Root 461fa8b05d resolved conflicts for merge of 18490fb9 to master ...

Change-Id: I6c68e6fb0f9c1182a955689bbffc161a8f30bd37

2011-04-12 12:51:08 -07:00

..

java

Merge "protect all /cache/recovery/last_* files from deletion"

2011-04-12 11:30:47 -07:00

jni

More native code cleanup.

2011-04-12 11:28:59 -07:00

res

Import revised translations.

2011-04-11 14:25:44 -07:00

tests

resolved conflicts for merge of 18490fb9 to master

2011-04-12 12:51:08 -07:00