Chia-chi Yeh bb2c2c14ed am 3a91abcb: am d3aaad0e: Merge "Use getMinFrameCount() instead of querying AudioSystem directly." into gingerbread ...

Merge commit '3a91abcb4cd06751009c155bfdce6c0a15a704df'

* commit '3a91abcb4cd06751009c155bfdce6c0a15a704df':
  Use getMinFrameCount() instead of querying AudioSystem directly.

2010-08-23 12:01:18 -07:00

..

config

…

java

Merge "resolved conflicts for merge of a842d143 to master"

2010-08-23 11:42:24 -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