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

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

2015-05-20 11:07:34 +00:00

..

java

am 886ab256: am cb7c0350: Merge "Undeprecate android.net.ProxyInfo as it\'s still used." into mnc-dev

2015-05-20 11:07:34 +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:44 +00:00

tests

Set NLM_F_ACK in our RTM_NEWNEIGH requests

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