Eric Fischer 569a57dc01 Merge "Import revised translations."

2010-09-13 10:04:58 -07:00

..

config

…

java

am fb8116f7: am c891d2b3: Merge "Fix PointerLocationView when pointer ids are not zero-based." into gingerbread

2010-09-12 20:50:16 -07:00

jni

Merge "Return count of rows in a resultset only once (when startPos = 0)"

2010-09-10 13:45:45 -07:00

res

Merge "Import revised translations."

2010-09-13 10:04:58 -07:00

tests

resolved conflicts for merge of 171c83f4 to master

2010-09-12 13:55:18 -07:00