Erik Kline 81092a2de8 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev ...

am: 42a5755916

* commit '42a5755916a21f01d264bdb58d2213dacf221cdf':
  DHCPv4: lease expiration is fatal, renew failures are not

Change-Id: Ic99edb732d532da27c042824e5ca07c4b35ccfa1

2016-05-19 04:21:17 +00:00

..

java/android/net

DHCPv4: lease expiration is fatal, renew failures are not

2016-05-18 16:17:03 +09: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