tree f7e599b5eb2c9c7b3fbe472dd2a7bea4f9190e6e
parent be04f7247a5835bcba2f598e9d47e0a07d08af3d
parent 0c0fd01a61505332f199f46d67f67c3752fe11ec
author Android Build Merger (Role) <android-build-merger@google.com> 1463971165 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1463971166 +0000

Merge "Merge "Use an attribute for the network security config resource" into nyc-dev am: 6812bdf387 am: c6a49bb008" into nyc-mr1-dev-plus-aosp