Ying Wang a3fbe753e4 Merge "Import translations. DO NOT MERGE"

2012-06-29 17:50:58 -07:00

..

java

resolved conflicts for merge of a9c38461 to master

2012-06-29 16:23:49 -07:00

jni

Initialize shaper offset array. Needed for bug 5443796.

2012-06-26 08:59:17 -07:00

res

Import translations. DO NOT MERGE

2012-06-29 11:48:50 -07:00

tests

Merge "Packages for PackageManagerService tests"

2012-06-20 09:13:47 -07:00