tree d92ab8285fd64075e1b7f36c5bd38c8498b26b65
parent 0a78ce67b4059b5929f2575700c8c246efb781d5
parent 97520fb0dda9dd5eddb9a8ecbc9f2bfb0086b406
author Hugo Benichi <hugobenichi@google.com> 1496992578 +0000
committer android-build-merger <android-build-merger@google.com> 1496992578 +0000

Merge "New Metrics constants for captive portal related UI" am: aac9aff5dc am: 75792d4299  -s ours
am: 97520fb0dd  -s ours

Change-Id: Ia8e70a92b70cc1321024156c5a8879352827d567