Jean-Baptiste Queru b4ac801c47 am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable" ...

* commit '1ca2fee9547dbdd7008211ac318b1f8f40ce1e35':
  Make default value of auto-sync in SyncStorageEngine configurable

2012-09-05 12:10:44 -07:00

..

java

am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable"

2012-09-05 12:10:44 -07:00

jni

am 4ba4caed: Merge "Fix SkBitmap::fPixels not being locked correctly"

2012-08-29 11:55:20 -07:00

res

am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable"

2012-09-05 12:10:44 -07:00

tests

am a950daf5: Merge changes Ieb566a2a,I953057cd

2012-08-16 16:33:40 -07:00