tree 9b8c88bad42d3cc8729261b1b63f8d9eb2810f1e
parent 8cbd7c8a8ad2f8512f9078731b757b0f0a2eeeb1
parent 75051c3a62123b4668231d0243ba11462e02ac5a
author Jeff Sharkey <jsharkey@google.com> 1444668958 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444668958 +0000

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

* commit '75051c3a62123b4668231d0243ba11462e02ac5a':
  Push firewall rules up to ConnectivityService.