commit | 1d321fa14fb0a374313ed6df179731e3c90f9ad0 | [log] [tgz] |
---|---|---|
author | Alex Klyubin <klyubin@google.com> | Wed Mar 25 21:07:48 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 25 21:07:48 2015 +0000 |
tree | 978b47eff9fc105a1fbbcd3320745b8b11a911a4 | |
parent | 85d787d33677aa7049b27c22458bbd4d2f23bd28 [diff] | |
parent | 2faa736e7dfab88bfdf1ff7022397af182815503 [diff] |
am 2faa736e: am 6a7ac540: am a9f62866: Merge "Framework\'s NetworkSecurityPolicy delegates to libcore\'s one." * commit '2faa736e7dfab88bfdf1ff7022397af182815503': Framework's NetworkSecurityPolicy delegates to libcore's one.