Fabrice Di Meglio 65a466ae46 am 3b8d33b1: Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr1 ...

* commit '3b8d33b131956f3a1b41c15dbe07b1b2d7f44086':
  Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE

2011-11-01 20:32:40 +00:00

..

java

am 00ef15b9: Merge "Clamp initial scale between minimum and maximum values." into ics-mr1

2011-11-01 18:30:26 +00:00

jni

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

2011-11-01 20:32:40 +00:00

res

am 7775f52e: Merge "Bring timestamps back to notifications." into ics-mr1

2011-11-01 20:07:23 +00:00

tests

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

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