Jim Miller 5ee2a771b5 am 14f56a0b: am b35cd7dd: Merge "Fix 2667859: change text back to default size" into kraken

2010-05-26 11:42:33 -07:00

..

config

…

java

resolved conflicts for merge of 3cd6a3e3 to master

2010-05-26 10:37:48 -07:00

jni

when sqlite returns SQLITE_OK on SQLITEStatement.execute(), ignore it

2010-05-26 10:14:41 -07:00

res

am 14f56a0b: am b35cd7dd: Merge "Fix 2667859: change text back to default size" into kraken

2010-05-26 11:42:33 -07:00

tests

Merge "close() on anything other than database shouldn't acquire db lock."

2010-05-20 12:42:16 -07:00