Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev
authorPaul Jensen <pauljensen@google.com>
Wed, 5 Aug 2015 10:04:11 +0000 (10:04 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 5 Aug 2015 10:04:11 +0000 (10:04 +0000)
commit1caf59d49e4713ad122bd9147c84759fcb935176
tree047710ec138a3d62a152bda1831ef5bd73253882
parent7808c92b9856924e63d1f0ccf71cd73133f21c74
parentaf171aa4dcf294bf2d1b9bed54ef9a6b0ec76361
Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev
src/java/com/android/internal/telephony/dataconnection/DataConnection.java
src/java/com/android/internal/telephony/dataconnection/DctController.java