Jim Miller 2333a02e15 Merge "Convert the outer lockscreen ring to a shape drawable. DO NOT MERGE" into ics-mr1

2011-10-26 15:40:08 -07:00

..

java

Merge "Only populate stack when StrictMode will use it." into ics-mr1

2011-10-26 15:37:34 -07:00

jni

Merge "Fix compilation issue when DEBUG_GLYPHS define is activated"

2011-10-20 18:58:03 -07:00

res

Merge "Convert the outer lockscreen ring to a shape drawable. DO NOT MERGE" into ics-mr1

2011-10-26 15:40:08 -07:00

tests

Fix use of WebView.loadData() to avoid passing invalid encoding

2011-10-17 15:11:33 +01:00