Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7710d07 authored by Paul Jensen's avatar Paul Jensen
Browse files

resolved conflicts for 70dd1f77 to lmp-sprout-dev 

Change-Id: I6998f13b2c3b76315c285e85f3ae485f83e418d0
parents f7abcb0d 70dd1f77

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+1 −1
Original line number Diff line number Diff line
@@ -941,7 +941,7 @@ public final class DataConnection extends StateMachine { 
                    default:

                }

            }

            ConnectivityManager.maybeMarkCapabilitiesRestricted(result);

            result.maybeMarkCapabilitiesRestricted();

        }

        int up = 14;

        int down = 14;