Dianne Hackborn c8f8497b9c resolved conflicts for merge of 66d633d2 to master ...

Change-Id: I6c38d7c4d127954dfca17082215c587a3cd4a586

2010-08-25 23:14:44 -07:00

..

config

…

java

resolved conflicts for merge of 66d633d2 to master

2010-08-25 23:14:44 -07:00

jni

resolved conflicts for merge of 50d35946 to master

2010-08-25 11:32:17 -07:00

res

Generated Romansh messages from Unicode CLDR.

2010-08-25 22:00:58 +02:00

tests

am d0ad67ad: Merge "Fix the test breakage in vCard tests." into gingerbread

2010-08-24 18:31:22 -07:00