OSDN Git Service

resolve merge conflicts of 89aa6fb to mnc-dr-dev
authorHugo Benichi <hugobenichi@google.com>
Thu, 10 Nov 2016 01:31:31 +0000 (10:31 +0900)
committerHugo Benichi <hugobenichi@google.com>
Thu, 10 Nov 2016 01:31:31 +0000 (10:31 +0900)
commita0cfb157ecf69c948e37db5a9df6cb8a8102874c
tree51c16458599bdb307e15c92fa5008eb2c30f2d68
parenteda0b0078e0f66a9ea3b077e7587d7dcee11e607
parent89aa6fb4d87b5a279150f15ad1f9bcfa03e3a261
resolve merge conflicts of 89aa6fb to mnc-dr-dev

Change-Id: I9e4e538081600be6a8199060bcb0d4040c071a22
services/net/java/android/net/dhcp/DhcpClient.java