Gilles Debunne 5989f4edc5 Merge "resolved conflicts for merge of a842d143 to master"

2010-08-23 11:42:24 -07:00

..

config

…

java

Merge "resolved conflicts for merge of a842d143 to master"

2010-08-23 11:42:24 -07:00

jni

am 821afa9a: am 54d41379: Merge "Add OBB flags to support overlays" into gingerbread

2010-08-21 09:41:12 -07:00

res

Merge "resolved conflicts for merge of a842d143 to master"

2010-08-23 11:42:24 -07:00

tests

am f996ed9f: Merge "Make vCard importer/exporter aware of multi-byte parameters." into gingerbread

2010-08-18 13:35:47 -07:00