tree 213c5a3018b8d66ce887a493c2bf607b5effa870
parent da5d9af80530e6bf662178668bef3ef3b926fe73
parent a03ecf7d7c8ff2844caf5feecc6d29f1f7346ff9
author Jeff Sharkey <jsharkey@google.com> 1444667974 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444667974 +0000

am a03ecf7d: Merge "Push firewall rules up to ConnectivityService." into mnc-dr-dev

* commit 'a03ecf7d7c8ff2844caf5feecc6d29f1f7346ff9':
  Push firewall rules up to ConnectivityService.