Gilles Debunne 27113f8646 Merge conflict due to wrong import paths. ...

Change-Id: I3bba20b26036de53b29bb0b30885fe33832ba3e3

2010-08-23 12:09:14 -07:00

..

config

…

java

Merge conflict due to wrong import paths.

2010-08-23 12:09:14 -07:00

jni

am 3a91abcb: am d3aaad0e: Merge "Use getMinFrameCount() instead of querying AudioSystem directly." into gingerbread

2010-08-23 12:01:18 -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