Ben Murdoch 4c333e1772 Merge "Update WebView#loadDataWithBaseURL documentation. DO NOT MERGE" into jb-mr2-dev

2013-03-04 19:40:55 +00:00

..

java

Merge "Update WebView#loadDataWithBaseURL documentation. DO NOT MERGE" into jb-mr2-dev

2013-03-04 19:40:55 +00:00

jni

jni: net.TrafficStats: fix getIfaceStat, have it use the iface.

2013-03-04 18:53:07 +00:00

res

Import translations. DO NOT MERGE

2013-03-01 08:55:13 -08:00

tests

Merge "Clean up scan handling"

2013-02-22 18:40:24 +00:00