Jean-Michel Trivi 97594d6cea Merge "Unhide KeyguardManager locked and secure state getters" into jb-dev

2012-05-24 18:27:37 -07:00

..

java

Merge "Unhide KeyguardManager locked and secure state getters" into jb-dev

2012-05-24 18:27:37 -07:00

jni

Merge "drop frame in case of error in updateTexImage" into jb-dev

2012-05-18 17:09:10 -07:00

res

Merge "Fix 6449259: FUL no longer overlaps music controls" into jb-dev

2012-05-24 08:50:58 -07:00

tests

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

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