| commit | afa10ad39a7effd964d6afc83dab891e98856e1d | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Sun Mar 22 00:40:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Mar 22 00:40:51 2015 +0000 |
| tree | a4cd8589a27f7cc5c52285e43e494c22cd874015 | |
| parent | bb132be258d80422a8a3bee9401034a241db7142 [diff] | |
| parent | 2110a28a6c7ef7d7802028d0a2dd9c14ceb432e1 [diff] |
am 2110a28a: am a4c4c575: Merge "Add android.security.NetworkSecurityPolicy." * commit '2110a28a6c7ef7d7802028d0a2dd9c14ceb432e1': Add android.security.NetworkSecurityPolicy.