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

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

Merge branch 'ics-mr1' of https://android.googlesource.com/platform/frameworks/base into aosp 

Conflicts:
	core/res/res/values/strings.xml
	policy/src/com/android/internal/policy/impl/GlobalActions.java
	services/java/com/android/server/WifiService.java
	services/sensorservice/SensorDevice.cpp
	telephony/java/com/android/internal/telephony/RIL.java

Change-Id: I89ec56d5ff282a2eb879ca40fb6d74ebcf752837
parents 7e350ef0 8b6ed2d1
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment