Dianne Hackborn 67ae551272 Merge "Keep activities stopped while the lock screen is up."

2012-04-12 18:18:45 -07:00

..

java

Merge "Keep activities stopped while the lock screen is up."

2012-04-12 18:18:45 -07:00

jni

Merge "Add Paint.setTextLocale()"

2012-04-12 17:37:44 -07:00

res

Merge "Clean up lock screen hide animation."

2012-04-12 15:28:52 -07:00

tests

Support metered Wi-Fi NetworkPolicy.

2012-04-05 16:02:25 -07:00