tree 2049b034c25274482b41ddd5b0b4cb074b2ca23a
parent d6f5e6bb91cf2f970a2410940860ed60db70df5e
parent a35d617cce6c9b1b1cba7e7c786849d21ea42d3e
author Chad Brubaker <cbrubaker@google.com> 1451940840 +0000
committer android-build-merger <android-build-merger@google.com> 1451940840 +0000

Merge "Add ConfigNetworkSecurityPolicy" am: 2786002bd5
am: a35d617cce

* commit 'a35d617cce6c9b1b1cba7e7c786849d21ea42d3e':
  Add ConfigNetworkSecurityPolicy