Jim Miller a67217c35e Merge "Fix 5404916: Make layout fit on 480x800 hdpi device" into ics-mr1

2011-11-01 12:45:11 -07:00

..

java

Merge "Clamp initial scale between minimum and maximum values." into ics-mr1

2011-11-01 11:28:01 -07:00

jni

resolved conflicts for merge of 2d280f75 to ics-mr1

2011-10-30 14:24:02 -07:00

res

Merge "Fix 5404916: Make layout fit on 480x800 hdpi device" into ics-mr1

2011-11-01 12:45:11 -07:00

tests

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

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