Mikhail Naganov d18607980d Merge "Specify that WebSettings.{get|set}DefaultZoom are not recommented to use"

2013-06-03 08:39:44 +00:00

..

java

Merge "Specify that WebSettings.{get|set}DefaultZoom are not recommented to use"

2013-06-03 08:39:44 +00:00

jni

Merge "wifi: Match function prototype from libhardware_legacy"

2013-05-30 20:00:51 +00:00

res

am 51e01f9e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

2013-06-01 08:23:19 -07:00

tests

am 4550dba5: Merge "Add wifi association test" into jb-mr2-dev

2013-05-08 15:21:12 -07:00