Dianne Hackborn e746f03c6c resolved conflicts for merge of 53686433 to master ...

Change-Id: I27004dc464f5771d3205ae5757c6eccc5b16854d

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

..

config

…

java

resolved conflicts for merge of 53686433 to master

2010-09-13 16:56:10 -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