tree 814cbe72678ff4bdbfcb7fa5c25c61d94ad515f2
parent 97520fb0dda9dd5eddb9a8ecbc9f2bfb0086b406
parent 30b7dfb526db3bea7d70cdaaecfcc25869f2cc45
author Hugo Benichi <hugobenichi@google.com> 1496992306 +0000
committer android-build-merger <android-build-merger@google.com> 1496992306 +0000

Merge "Instrument captive portal login activity" am: b213053def
am: 30b7dfb526

Change-Id: Iec106e30ce9dbb38189fe3888f6111be92816891