Jim Miller aa200e2bc0 Merge "Clean up separator string in keyguard view" into jb-mr1-lockscreen-dev

2012-11-02 17:33:41 -07:00

..

java

Merge "Update DevicePolicyManager documentation with new keyguard flags" into jb-mr1-lockscreen-dev

2012-11-02 16:20:52 -07:00

jni

Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev

2012-10-23 15:22:37 -07:00

res

Merge "Clean up separator string in keyguard view" into jb-mr1-lockscreen-dev

2012-11-02 17:33:41 -07:00

tests

Fix WiFi stress test

2012-10-31 17:03:23 -07:00