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

Skip to content
Commit b84c5ce6 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'ics-mr1-release' of... 

Merge branch 'ics-mr1-release' of https://android.googlesource.com/platform/packages/apps/Contacts into aosp

Conflicts:
	res/values-ru/strings.xml
	src/com/android/contacts/dialpad/DialpadFragment.java

Change-Id: Ia2a9d651991749b2a9d7957230769e040aabaf6e
parents 7170eb8f ff5e3dbc
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