Erik Kline 7b12b8ca59 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev am: bd4b5327db am: 8958153ac7 ...

am: 8ab4a8d08a

* commit '8ab4a8d08a3aadab24a20d227d9bbaf15e99f879':
  DHCPv4: lease expiration is fatal, renew failures are not

Change-Id: I4a0be195dab4525258b455330ce6212987b0e6c0

2016-05-19 04:27:26 +00:00

..

java/android/net

Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev am: bd4b5327db am: 8958153ac7

2016-05-19 04:27:26 +00:00

jni

resolve merge conflicts of bc90502 to nyc-dev-plus-aosp

2016-05-13 08:57:40 -07:00

tests/coretests

NetworkStats.Bucket API polish.

2016-03-14 11:24:12 -07:00