| commit | 343301a6249eec9c98a57b9030ef20eed74e52ca | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Mon May 23 02:39:25 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon May 23 02:39:26 2016 +0000 |
| tree | f7e599b5eb2c9c7b3fbe472dd2a7bea4f9190e6e | |
| parent | be04f7247a5835bcba2f598e9d47e0a07d08af3d [diff] | |
| parent | 0c0fd01a61505332f199f46d67f67c3752fe11ec [diff] |
Merge "Merge "Use an attribute for the network security config resource" into nyc-dev am: 6812bdf387 am: c6a49bb008" into nyc-mr1-dev-plus-aosp