tree e06a4dce7309f2dd0600d2403b16a970ea075397
parent 58821182c2476c041b5f9888c11120a5f9e578ca
parent dbaf29e09adbf2e44a598438fa8ad38f70c47b5b
author Stephen Chen <stewchen@google.com> 1506721989 +0000
committer android-build-merger <android-build-merger@google.com> 1506721989 +0000

Merge "WifiMetrics: add methods to increment ONA metrics." into oc-mr1-dev
am: dbaf29e09a

Change-Id: I4f4b49f963492a59085e8ba1f37b88713b6cf568