David Brown fcec46b3d4 resolved conflicts for merge of 9c43fffc to master ...

Change-Id: I6b5931bae7a9507b006c723db6c0b9589038e05c

2010-09-15 21:30:12 -07:00

..

config

…

java

resolved conflicts for merge of 9c43fffc to master

2010-09-15 21:30:12 -07:00

jni

am d63d7474: am 3fd5fa4c: Fix the runtime restart due to name change.

2010-09-15 19:11:05 -07:00

res

resolved conflicts for merge of 9c43fffc to master

2010-09-15 21:30:12 -07:00

tests

Revert "caching code retooled to reduce locking + handle SMP"

2010-09-14 11:55:24 -07:00