Fabrice Di Meglio 3b8d33b131 Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr1

2011-11-01 13:30:24 -07:00

..

java

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

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

jni

Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr1

2011-11-01 13:30:24 -07:00

res

Merge "Bring timestamps back to notifications." into ics-mr1

2011-11-01 13:05:41 -07:00

tests

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

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