tree 9a3e490323c076c68e68e2dfd389687374b3b1a6
parent 839e85c89054fb10c01fc6dbc04d2eabb112e0d3
parent 5d3a382aa4c7d93df15aaa2cd9b1144c7c8d2d1b
author Zach Johnson <zachoverflow@google.com> 1439335951 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439335951 +0000

am 5d3a382a: am 6d7af4b7: Merge "DO NOT MERGE Allow a custom component to handle network policy notifications" into cw-e-dev

* commit '5d3a382aa4c7d93df15aaa2cd9b1144c7c8d2d1b':
  DO NOT MERGE Allow a custom component to handle network policy notifications