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

Skip to content
Commit 0deccf27 authored by Anila kumar Vadla's avatar Anila kumar Vadla
Browse files

Merge commit '75f676ae' 

Conflicts:
	res/values-zh-rCN/strings.xml
	res/values/strings.xml
	src/com/android/settings/DevelopmentSettings.java
	src/com/android/settings/sim/MultiSimEnablerPreference.java
	src/com/android/settings/sim/SimSettings.java

Change-Id: I88c16bbc9075dddff8f1a35e3204c0f508dbd541
parents e9e61019 75f676ae
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