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

Skip to content
Commit 6fb3e138 authored by Wink Saville's avatar Wink Saville
Browse files

Merge commit '691b8d29' into fix-merge-conflict 

* commit '691b8d29':
  Change suffix UsingSubId to ForSubscriber.

Conflicts:
	src/java/com/android/internal/telephony/PhoneSubInfoProxy.java

Change-Id: I17b7a9bea56c993eeaf1496a3ac74ad6e587f057
parents f013b229 691b8d29
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment