Merge "Merged makeNetworkCapabilities and getCopyNetworkCapabilities" into oc-dev
authorJack Yu <jackyu@google.com>
Tue, 11 Apr 2017 17:33:01 +0000 (17:33 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 11 Apr 2017 17:33:02 +0000 (17:33 +0000)
commit1a4f9e5f59ddadcce94a358011966209bc28c5ca
tree4e07f042838143200273ff038c401e09b4b01718
parent828a110000eca870560ead99186d5727e96e64f8
parent6289b21a3b9f0214a862878096384d8ce90a572c
Merge "Merged makeNetworkCapabilities and getCopyNetworkCapabilities" into oc-dev
src/java/com/android/internal/telephony/dataconnection/DataConnection.java