Jeff Brown 767225d820 resolved conflicts for merge of d9ee01a9 to kraken ...

Change-Id: I645177513e6dfa4b3b02c0061b8026bde4acde8d

2010-03-30 23:49:17 -07:00

..

config

…

java

resolved conflicts for merge of d9ee01a9 to kraken

2010-03-30 23:49:17 -07:00

jni

Merge "Add support for GPS privacy lock. DO NOT MERGE" into froyo

2010-03-30 17:29:41 -07:00

res

resolved conflicts for merge of d9ee01a9 to kraken

2010-03-30 23:49:17 -07:00

tests

- changed periodic sync scheduling to just creating pending

2010-03-30 18:31:27 -07:00