Jeff Brown 41f7cb398e am 767225d8: resolved conflicts for merge of d9ee01a9 to kraken

2010-03-31 00:08:13 -07:00

..

config

donut snapshot

2009-05-20 11:28:04 -07:00

java

am 767225d8: resolved conflicts for merge of d9ee01a9 to kraken

2010-03-31 00:08:13 -07:00

jni

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

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

res

am 767225d8: resolved conflicts for merge of d9ee01a9 to kraken

2010-03-31 00:08:13 -07:00

tests

am 6669a7b4: am 4a2f285d: am 77c560f3: - changed periodic sync scheduling to just creating pending and changed the "get next operation to sync" logic just look at pending syncs, rather than them and periodic syncs - made syncoperation dup-detection ignore the init

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