Jean-Baptiste Queru a6fa26f83f resolved conflicts for merge of 6c9a3004 to master ...

Change-Id: Ia1a8a2015c087004d3dfc64681dbe0315558dc95

2010-06-21 11:44:49 -07:00

..

config

…

java

resolved conflicts for merge of 6c9a3004 to master

2010-06-21 11:44:49 -07:00

jni

resolved conflicts for merge of 6c9a3004 to master

2010-06-21 11:44:49 -07:00

res

am 0fcfa0a5: am f25c560d: am 30cf330f: Import revised translations

2010-06-21 11:37:10 -07:00

tests

move a sqlite test from framework-tests to coretests

2010-06-17 14:27:56 -07:00