Matthew Xie 29775794d6 Merge "Get rid of the extra bt_disable call when turning on airplane mode Get rid of enabling bt when in airplane mode." into jb-dev

2012-06-27 15:47:53 -07:00

..

java

Merge "Get rid of the extra bt_disable call when turning on airplane mode Get rid of enabling bt when in airplane mode." into jb-dev

2012-06-27 15:47:53 -07:00

jni

Handle ENITR failure for Headset control channel.

2012-06-14 20:08:40 -07:00

res

Import translations. DO NOT MERGE

2012-06-27 14:00:38 -07:00

tests

Merge "Change NPN to forbid empty lists of protocols." into jb-dev

2012-05-17 11:18:33 -07:00