tree 597880ba4c619f34746da6826a469d5d087bebe9
parent 555f67cfcbeb0499736f2adaa6452bc89216e3e8
parent d2e0cd827eaed97e8bf8f5abc73c81d15d9b3a4c
author Hugo Benichi <hugobenichi@google.com> 1499841868 +0000
committer android-build-merger <android-build-merger@google.com> 1499841868 +0000

Merge "Instrument captive portal login activity" into oc-dev-plus-aosp am: 50c561a3db  -s ours
am: d2e0cd827e  -s ours

Change-Id: Id47ea62bad68a60e2689c2e66dfa7870760a9b1d