OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0e591c2 5ab9af4)
am 5ab9af41: am f76b5383: DO NOT MERGE Un-deprecate getDhcpInfo
authorRobert Greenwalt <rgreenwalt@google.com>
Mon, 7 Oct 2013 00:03:59 +0000 (17:03 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 7 Oct 2013 00:03:59 +0000 (17:03 -0700)
* commit '5ab9af410e1ba572e8ac0577c2acb5324b65d66c':
  DO NOT MERGE Un-deprecate getDhcpInfo

1  2 
api/current.txt patch | diff1 | diff2 | blob | history

diff --cc api/current.txt
Simple merge
frameworks/base
About OSDN
Find Software
Develop Software
Help