Tom Taylor adfe6383ee Merge "NPE in Threads.getOrCreateThreadId(Telephony.java:1275)" into ics-mr1

2011-10-31 12:51:19 -07:00

..

java

Merge "NPE in Threads.getOrCreateThreadId(Telephony.java:1275)" into ics-mr1

2011-10-31 12:51:19 -07:00

jni

resolved conflicts for merge of 2d280f75 to ics-mr1

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

res

am 69e640ee: Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0

2011-10-30 21:37:09 +00:00

tests

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

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