tree 0bb32c094d5482e923b8025c3188c30e618b3631
parent 779f824a1b6dd942815d33b3315b9f6c066b94eb
parent 99bd27f7ee9613f2e26c4fe02d98bc07922db42e
author Stephen Chen <stewchen@google.com> 1480563299 +0000
committer android-build-merger <android-build-merger@google.com> 1480563299 +0000

Merge "Add meteredOverride field to WifiConfiguration." am: f9479fe639 am: dfd9942a31
am: 99bd27f7ee

Change-Id: I07a9a25076807897399b5265cc19957f3f45d81c