Baligh Uddin c84dd90ae6 Merge "Import translations. DO NOT MERGE"

2013-11-01 14:35:14 +00:00

..

java

am 68724352: am 3a9a2089: am e6411e68: Merge "Set persist.sys.dalvik.vm.lib at system server startup" into klp-dev

2013-10-31 22:32:49 -07:00

jni

resolved conflicts for merge of ed84dea9 to master

2013-10-29 14:58:16 -07:00

res

Merge "Import translations. DO NOT MERGE"

2013-11-01 14:35:14 +00:00

tests

Merge "Get rid of coretests/android.text.HtmlTest"

2013-10-23 17:35:49 +00:00