Eric Laurent 0eecc27714 Merge "AudioRecord JAVA: expose audio session Id"

2011-07-20 19:25:34 -07:00

..

java

Merge "when disconnectHeadsetInternal, allow it when the BT is not disabled"

2011-07-20 19:08:38 -07:00

jni

Merge "AudioRecord JAVA: expose audio session Id"

2011-07-20 19:25:34 -07:00

res

Merge "Fix bug 5038368 - Rules for collapsing action views."

2011-07-20 14:30:48 -07:00

tests

Skip byte order mark (BOM) in JsonReader

2011-07-20 12:23:23 -07:00