OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 90b9ed5 ead46ec)
Merge "Add xml source for network security configuration"
authorChad Brubaker <cbrubaker@google.com>
Sat, 7 Nov 2015 22:14:36 +0000 (22:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 7 Nov 2015 22:14:36 +0000 (22:14 +0000)
am: ead46ecc84

* commit 'ead46ecc843e3686ff5ae8008f4452fc79f847e7':
  Add xml source for network security configuration


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