Gilles Debunne efaa4f075d resolved conflicts for merge of 1153629c to master ...

Change-Id: I2838fc7e5a428fd52c811087b6c5481cf95eef0e

2010-10-06 14:38:27 -07:00

..

config

…

java

Merge "Fix pressed vs selected typo in onCreateDrawableState"

2010-10-06 11:45:55 -07:00

jni

don't print informational messages from sqlite in log

2010-10-04 18:10:51 -07:00

res

resolved conflicts for merge of 1153629c to master

2010-10-06 14:38:27 -07:00

tests

Merge "Make a separate active sync queue for initialization and regular syncs."

2010-10-06 10:03:19 -07:00