Paul Jensen 3766cb3b76 am cb7c0350: Merge "Undeprecate android.net.ProxyInfo as it\'s still used." into mnc-dev ...

* commit 'cb7c035081c650ea356b625ed51865c6e3b18d21':
  Undeprecate android.net.ProxyInfo as it's still used.

2015-05-20 10:55:28 +00:00

..

java

Merge "Undeprecate android.net.ProxyInfo as it's still used." into mnc-dev

2015-05-20 10:49:04 +00:00

jni

Merge "Query HTTP proxy for network via a new API to avoid permissions exceptions" into mnc-dev

2015-05-19 17:58:11 +00:00

res

am 6246ade0: Merge "Remove controlBackground attribute, replace with direct reference" into mnc-dev

2015-05-19 17:19:54 +00:00

tests

Set NLM_F_ACK in our RTM_NEWNEIGH requests

2015-05-20 16:46:30 +09:00