commit | 2110a28a6c7ef7d7802028d0a2dd9c14ceb432e1 | [log] [tgz] |
---|---|---|
author | Alex Klyubin <klyubin@google.com> | Fri Mar 20 18:08:30 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 18:08:30 2015 +0000 |
tree | 8925cf10ef6c6db84a0ae7a1e011fa26c4544b77 | |
parent | 685d33dd18aba2c9ceb7586a638ec7850c1872a7 [diff] | |
parent | a4c4c575c793d3ba4847107b15ce3a9dd5395878 [diff] |
am a4c4c575: Merge "Add android.security.NetworkSecurityPolicy." * commit 'a4c4c575c793d3ba4847107b15ce3a9dd5395878': Add android.security.NetworkSecurityPolicy.