OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 125fb86 021a95f)
am 021a95f7: Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkPrope...
authorPaul Jensen <pauljensen@google.com>
Wed, 5 Nov 2014 19:11:32 +0000 (19:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 5 Nov 2014 19:11:32 +0000 (19:11 +0000)
* commit '021a95f761e1bc26cc215a9daedb04af818002f5':
  Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help