OSDN Git Service

(root) / android-x86 / system-netd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b9ae17 e287d24)
am e287d24e: Merge "Allow overlap in UidMarkMap" into klp-dev
authorChad Brubaker <cbrubaker@google.com>
Fri, 21 Mar 2014 21:02:49 +0000 (21:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Mar 2014 21:02:49 +0000 (21:02 +0000)
* commit 'e287d24e9cfd6ed84bdb69a82b6f8357de2fee34':
  Allow overlap in UidMarkMap


Trivial merge
system/netd
About OSDN
Find Software
Develop Software
Help