OSDN Git Service

Merge "Remove captive portal sign-in actions." into lmp-dev
authorPaul Jensen <pauljensen@google.com>
Mon, 25 Aug 2014 18:52:31 +0000 (18:52 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 25 Aug 2014 18:52:32 +0000 (18:52 +0000)
1  2 
api/current.txt
services/core/java/com/android/server/connectivity/NetworkMonitor.java

diff --cc api/current.txt
Simple merge