OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dafd2f5 34eae0f)
am c17062e5: am 71915080: am 6974f6a9: Merge "Block address families with routes...
authorLorenzo Colitti <lorenzo@google.com>
Wed, 24 Sep 2014 03:57:34 +0000 (03:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 24 Sep 2014 03:57:34 +0000 (03:57 +0000)
* commit 'c17062e534b46cffdc0f1a49bf6f2ee5df67a08f':
  Block address families with routes, not NetworkAgent side channel


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