Dianne Hackborn ade9916d5c resolved conflicts for merge of 6421ae7e to master ...

Change-Id: Ic8c4418f13a42fc1d3a44ad68e32b4e438b07f6f

2010-09-13 21:41:57 -07:00

..

config

…

java

resolved conflicts for merge of 6421ae7e to master

2010-09-13 21:41:57 -07:00

jni

resolved conflicts for merge of 0522f5e9 to master

2010-09-13 14:57:59 -07:00

res

resolved conflicts for merge of 53686433 to master

2010-09-13 16:56:10 -07:00

tests

caching code retooled to reduce locking + handle SMP

2010-09-13 14:38:24 -07:00