Dianne Hackborn 5c83a5f2cc resolved conflicts for merge of 2ecce34f to master ...

Change-Id: Ic4e38199beaf8c16f9d28ac5296e8aaa61788b36

2010-03-12 16:46:46 -08:00

..

java

resolved conflicts for merge of 2ecce34f to master

2010-03-12 16:46:46 -08:00

jni

less log spew

2010-01-08 15:46:24 -05:00

tests/servicestests

Modifying Services Tests XML file so it builds with the right permissions.

2010-02-02 17:09:00 -08:00