Ying Wang 249405253d Import translations. DO NOT MERGE ...

Change-Id: I6ab3489fe984c442dceaef41e76ee5e6783e65ef

2012-06-15 12:44:39 -07:00

..

java

Merge "Synthesize fake vsyncs when the screen is off." into jb-dev

2012-06-14 21:30:49 -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-15 12:44:39 -07:00

tests

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

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