| commit | 0c0fd01a61505332f199f46d67f67c3752fe11ec | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Mon May 23 02:38:20 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 23 02:38:20 2016 +0000 |
| tree | f7e599b5eb2c9c7b3fbe472dd2a7bea4f9190e6e | |
| parent | 6ffd2b28292fce8adf925ab35b9533dc35fa50df [diff] | |
| parent | c6a49bb008068eaa53ce308ffa4abaa2924c69ea [diff] |
Merge "Use an attribute for the network security config resource" into nyc-dev am: 6812bdf387 am: c6a49bb008 * commit 'c6a49bb008068eaa53ce308ffa4abaa2924c69ea': Use an attribute for the network security config resource Change-Id: I10122107c51f3e986b362cc7e0307f73a8983b0b