tree be6435c9f95de12e5661eee926639c219f6daa69
parent 0c2857d48b4bfb06ee3d6e0e92ee75dc66541293
parent 1a3e41d629c269dc66531cef0fb331ac94e5c273
author Jeff Sharkey <jsharkey@android.com> 1308355050 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1308355050 -0700

Merge "Refactor network policy: paid to metered."