| commit | b0d403dddd05fb25d876b9dd48eb455d4edefc3f | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Mon Mar 30 17:14:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 30 17:14:00 2015 +0000 |
| tree | b519237fd8f1bd188d7eef9ad69f58cc2bfc94fc | |
| parent | 30a19d9afc3a0dc99c8cce51c630939a2a76a743 [diff] | |
| parent | aa83190cb650e9b714f2b980aa29ece8f86d587a [diff] |
am aa83190c: Merge "Honor NetworkSecurityPolicy regarding cleartext traffic." * commit 'aa83190cb650e9b714f2b980aa29ece8f86d587a': Honor NetworkSecurityPolicy regarding cleartext traffic.