Fred Quintana 2e192931d5 am 2bf0f1a3: am 00b92b94: am 9aaf24f2: Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo

2010-04-28 14:25:19 -07:00

..

config

…

java

am 2bf0f1a3: am 00b92b94: am 9aaf24f2: Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo

2010-04-28 14:25:19 -07:00

jni

resolved conflicts for merge of 86303198 to kraken

2010-04-26 17:42:07 -07:00

res

am 5d84df0c: am 9fe55514: am 4bba2149: Merge "Import revised translations" into froyo

2010-04-28 09:56:45 -07:00

tests

Merge "2604226 Add test cases for the internal accessibility infrastructure."

2010-04-27 15:47:12 -07:00