From: Jeff Sharkey <jsharkey@android.com>
Date: Fri, 3 Feb 2012 00:28:34 +0000 (-0800)
Subject: am 0370b9c3: Merge "Update for NetworkPolicy refactoring."
X-Git-Tag: android-x86-4.4-r1~1773
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f00df412fdbaca1d8567a9621223321955572cd3;p=android-x86%2Fpackages-apps-Settings.git

am 0370b9c3: Merge "Update for NetworkPolicy refactoring."

* commit '0370b9c3f76584462cffc3c283fcc70d9c8419c1':
  Update for NetworkPolicy refactoring.
---

f00df412fdbaca1d8567a9621223321955572cd3