OSDN Git Service

Merge "Add xml source for network security configuration" am: ead46ecc84
authorChad Brubaker <cbrubaker@google.com>
Sat, 7 Nov 2015 22:21:40 +0000 (22:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 7 Nov 2015 22:21:40 +0000 (22:21 +0000)
am: 0cb8f01410

* commit '0cb8f014105b9e8e3bdb12cf091ef61e8c575333':
  Add xml source for network security configuration


Trivial merge