Adam Powell 0a9dd820eb am 1759af3b: Merge "Bug 5535639 - Monkeys mad at FragmentManager" into ics-mr1 ...

* commit '1759af3bc8a8f1346e3fb95351ed8037f38526d8':
  Bug 5535639 - Monkeys mad at FragmentManager

2011-10-31 19:39:10 +00:00

..

java

am 1759af3b: Merge "Bug 5535639 - Monkeys mad at FragmentManager" into ics-mr1

2011-10-31 19:39:10 +00:00

jni

merged by hand (services/java/com/android/server/PowerManagerService.java needs to be reviewed)

2011-10-31 06:06:27 -07:00

res

merged by hand (services/java/com/android/server/PowerManagerService.java needs to be reviewed)

2011-10-31 06:06:27 -07:00

tests

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

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