OSDN Git Service

Merge "Instrument captive portal login activity" into oc-dev-plus-aosp
authorHugo Benichi <hugobenichi@google.com>
Wed, 12 Jul 2017 06:34:05 +0000 (06:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Jul 2017 06:34:05 +0000 (06:34 +0000)
commitd2e0cd827eaed97e8bf8f5abc73c81d15d9b3a4c
tree7a238da4c126ede9b30dfa0727630c4c15a5d745
parent82e4d525e516fc7484f8ca66187fc6db11cf34cb
parent50c561a3db18c31a1eb30751ed34f1e1830bd04b
Merge "Instrument captive portal login activity" into oc-dev-plus-aosp
am: 50c561a3db  -s ours

Change-Id: I068db2d0b7e08f373ce2e1d7ed2618245cec6562