tree 5bd4543a6d1c2681f2710f73d0244418d4acd884
parent 578a76e7de77492ac33e407fff4fb9a2f5550d8a
parent e9e6083ee19b7474d853b4b8c3e4b4fbcba30855
author Jeremy Joslin <jjoslin@google.com> 1457023767 +0000
committer Android Partner Code Review <android-gerrit-partner@google.com> 1457023768 +0000

Merge "Revert "New systemapi to mark a wifi network as metered."" into mm-wireless-dev