Eric Fischer 3dc1af6b68 Import translations. DO NOT MERGE ...

Change-Id: I050bc722a5a06acc49fc519d57bf16b14158e97a

2012-06-19 14:38:50 -07:00

..

java

Merge "Docs only: DENSITY_TV, not just for TVs any more!" into jb-dev

2012-06-19 10:54:42 -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-19 14:38:50 -07:00

tests

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

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