OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9494689) | patch
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)
committerThe Android Automerger <android-build@android.com>
Wed, 7 Dec 2016 00:33:28 +0000 (16:33 -0800)
commitdb66afe61e52f81f185593a2b6dd63c436ce9014
tree7b1423780a071e5d650dc69e5fbd2cc3e54c3729tree | snapshot
parent94946899615c2af2eaa39895a1242499d078c3c8commit | diff
resolve merge conflicts of 89aa6fb to mnc-dr-dev

Change-Id: I9e4e538081600be6a8199060bcb0d4040c071a22
(cherry picked from commit a0cfb157ecf69c948e37db5a9df6cb8a8102874c)
services/net/java/android/net/dhcp/DhcpClient.java diff | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help