| commit | 76d3d8590d1fb9a9c341159fbc06914ef19bdb8d | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Mon May 23 02:32:19 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 23 02:32:19 2016 +0000 |
| tree | 354613b9952175179b505017692bac2c52c16e16 | |
| parent | d2e17918070aac1343197387162af2eb91dd73e6 [diff] | |
| parent | 6812bdf38797101d3744befe70f3501b75f01ce6 [diff] |
Merge "Use an attribute for the network security config resource" into nyc-dev am: 6812bdf387 * commit '6812bdf38797101d3744befe70f3501b75f01ce6': Use an attribute for the network security config resource Change-Id: I2236b69a2af2258e7600a4833fe7be95f64e6260