Merge "Fix DHCP lease time parsing." into mnc-dev

author Lorenzo Colitti <lorenzo@google.com>

Tue, 2 Jun 2015 07:47:46 +0000 (07:47 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 2 Jun 2015 07:47:48 +0000 (07:47 +0000)
author Lorenzo Colitti <lorenzo@google.com>
Tue, 2 Jun 2015 07:47:46 +0000 (07:47 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 2 Jun 2015 07:47:48 +0000 (07:47 +0000)
diff --cc services/net/java/android/net/dhcp/DhcpClient.java
Simple merge
author	Lorenzo Colitti <lorenzo@google.com>
	Tue, 2 Jun 2015 07:47:46 +0000 (07:47 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 2 Jun 2015 07:47:48 +0000 (07:47 +0000)