Adam Powell 9a60c0d466 am ca4100da: Merge "Fix bug 5534667 - Action bar icons need more space on tablet" into ics-mr1 ...

* commit 'ca4100da0a0481b3b9f464bbc8842b571e8c60d5':
  Fix bug 5534667 - Action bar icons need more space on tablet

2011-11-01 18:00:58 +00:00

..

java

am ca4100da: Merge "Fix bug 5534667 - Action bar icons need more space on tablet" into ics-mr1

2011-11-01 18:00:58 +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

am ca4100da: Merge "Fix bug 5534667 - Action bar icons need more space on tablet" into ics-mr1

2011-11-01 18:00:58 +00:00

tests

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

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