[Nexus 5 Original Android Development] pkelly517:
here's what happens when I pull https://gerrit.slimroms.net/#/c/11505

peter@crichton ~/slimkat/frameworks/base $ git pull https://gerrit.slimroms.net/SlimRoms/frameworks_base refs/changes/05/11505/2
remote: Counting objects: 59, done
remote: Finding sources: 100% (33/33)
remote: Total 33 (delta 14), reused 33 (delta 14)
Unpacking objects: 100% (33/33), done.
From https://gerrit.slimroms.net/SlimRoms/frameworks_base
* branch refs/changes/05/11505/2 -> FETCH_HEAD
Auto-merging telephony/java/android/telephony/TelephonyManager.java
Auto-merging telephony/java/android/telephony/SignalStrength.java
CONFLICT (content): Merge conflict in telephony/java/android/telephony/SignalStrength.java
Auto-merging services/java/com/android/server/location/GpsLocationProvider.java
Auto-merging services/java/com/android/server/display/WifiDisplayController.java
CONFLICT (content): Merge conflict in services/java/com/android/server/display/WifiDisplayController.java
Auto-merging services/java/com/android/server/LocationManagerService.java
Auto-merging packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
CONFLICT (content): Merge conflict in packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
Auto-merging packages/SettingsProvider/res/values/defaults.xml
CONFLICT (content): Merge conflict in packages/SettingsProvider/res/values/defaults.xml
Auto-merging media/java/android/media/MediaFocusControl.java
Auto-merging media/java/android/media/CamcorderProfile.java
Auto-merging media/java/android/media/AudioService.java
Auto-merging media/java/android/media/AudioManager.java
Auto-merging core/res/res/values/symbols.xml
Auto-merging core/res/res/values/strings.xml
Auto-merging core/res/res/values/slim_symbols.xml
CONFLICT (content): Merge conflict in core/res/res/values/slim_symbols.xml
Auto-merging core/res/res/values/public.xml
CONFLICT (content): Merge conflict in core/res/res/values/public.xml
Auto-merging core/res/res/values/config.xml
Auto-merging core/res/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in core/res/res/values-ru/strings.xml
Auto-merging core/res/res/values-es/slim_strings.xml
CONFLICT (add/add): Merge conflict in core/res/res/values-es/slim_strings.xml
Auto-merging core/jni/android_view_Surface.cpp
Auto-merging core/java/com/android/internal/os/ZygoteInit.java
CONFLICT (content): Merge conflict in core/java/com/android/internal/os/ZygoteInit.java
Auto-merging core/java/android/bluetooth/BluetoothAdapter.java
Auto-merging cmds/bootanimation/BootAnimation.cpp
Auto-merging cmds/bootanimation/Android.mk
CONFLICT (content): Merge conflict in cmds/bootanimation/Android.mk
Auto-merging Android.mk
Recorded preimage for 'cmds/bootanimation/Android.mk'
Recorded preimage for 'core/java/com/android/internal/os/ZygoteInit.java'
Recorded preimage for 'core/res/res/values-es/slim_strings.xml'
Recorded preimage for 'core/res/res/values-ru/strings.xml'
Recorded preimage for 'core/res/res/values/public.xml'
Recorded preimage for 'core/res/res/values/slim_symbols.xml'
Recorded preimage for 'packages/SettingsProvider/res/values/defaults.xml'
Recorded preimage for 'packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java'
Recorded preimage for 'services/java/com/android/server/display/WifiDisplayController.java'
Recorded preimage for 'telephony/java/android/telephony/SignalStrength.java'
Automatic merge failed; fix conflicts and then commit the result.
peter@crichton ~/slimkat/frameworks/base $

Cherry picking worked just fine.