tree b650a5faaaa3999c790743537cdaeedcc176cd6d
parent c217adaf6756003684d195713dda8a9b215f5dbc
parent 6a7ac540e16cdf6a499580177f4e47a7f39d8554
author Alex Klyubin <klyubin@google.com> 1427312981 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427312981 +0000

am 6a7ac540: am a9f62866: Merge "Framework\'s NetworkSecurityPolicy delegates to libcore\'s one."

* commit '6a7ac540e16cdf6a499580177f4e47a7f39d8554':
  Framework's NetworkSecurityPolicy delegates to libcore's one.