Jim Miller 839458d8d4 resolved conflicts for merge of e03952c0 to master ...

Change-Id: I414d934101d452a2c2500e539f0b0aff1e1b3ff0

2010-07-14 17:21:00 -07:00

..

config

…

java

resolved conflicts for merge of e03952c0 to master

2010-07-14 17:21:00 -07:00

jni

Merge "Pass network properties to ConnectivityService."

2010-07-14 09:09:31 -07:00

res

resolved conflicts for merge of e03952c0 to master

2010-07-14 17:21:00 -07:00

tests

reduce locking when using SQLiteStatement

2010-07-09 12:31:12 -07:00