[Nexus 7 Android Development] jblazea50:
android@builduntu:~/psx-light/frameworks/base$ git status
# HEAD detached at 0324d29
# You are currently cherry-picking.
# (fix conflicts and run "git commit")
#
# Changes to be committed:
#
#	modified: core/java/android/app/INotificationManager.aidl
#	new file: packages/SystemUI/res/drawable-hdpi/ic_ad_dismiss_notification_activated.png
#	new file: packages/SystemUI/res/drawable-hdpi/ic_ad_dismiss_notification_normal.png
#	new file: packages/SystemUI/res/drawable-hdpi/ic_ad_lock_pressed.png
#	new file: packages/SystemUI/res/drawable-hdpi/ic_ad_morenotifications.png
#	new file: packages/SystemUI/res/drawable-hdpi/ic_ad_target_unlock_activated.png
#	new file: packages/SystemUI/res/drawable-hdpi/ic_ad_target_unlock_normal.png
#	new file: packages/SystemUI/res/drawable-hdpi/ic_ad_unknown_icon.png
#	new file: packages/SystemUI/res/drawable-hdpi/ic_ad_unlock.png
#	new file: packages/SystemUI/res/drawable-hdpi/ic_handle_notification_normal.png
#	new file: packages/SystemUI/res/drawable-mdpi/ic_ad_dismiss_notification_activated.png
#	new file: packages/SystemUI/res/drawable-mdpi/ic_ad_dismiss_notification_normal.png
#	new file: packages/SystemUI/res/drawable-mdpi/ic_ad_lock_pressed.png
#	new file: packages/SystemUI/res/drawable-mdpi/ic_ad_morenotifications.png
#	new file: packages/SystemUI/res/drawable-mdpi/ic_ad_target_unlock_activated.png
#	new file: packages/SystemUI/res/drawable-mdpi/ic_ad_target_unlock_normal.png
#	new file: packages/SystemUI/res/drawable-mdpi/ic_ad_unknown_icon.png
#	new file: packages/SystemUI/res/drawable-mdpi/ic_ad_unlock.png
#	new file: packages/SystemUI/res/drawable-mdpi/ic_handle_notification_normal.png
#	new file: packages/SystemUI/res/drawable-xhdpi/ic_ad_dismiss_notification_activated.png
#	new file: packages/SystemUI/res/drawable-xhdpi/ic_ad_dismiss_notification_normal.png
#	new file: packages/SystemUI/res/drawable-xhdpi/ic_ad_lock_pressed.png
#	new file: packages/SystemUI/res/drawable-xhdpi/ic_ad_morenotifications.png
#	new file: packages/SystemUI/res/drawable-xhdpi/ic_ad_target_unlock_activated.png
#	new file: packages/SystemUI/res/drawable-xhdpi/ic_ad_target_unlock_normal.png
#	new file: packages/SystemUI/res/drawable-xhdpi/ic_ad_unknown_icon.png
#	new file: packages/SystemUI/res/drawable-xhdpi/ic_ad_unlock.png
#	new file: packages/SystemUI/res/drawable-xhdpi/ic_handle_notification_normal.png
#	new file: packages/SystemUI/res/drawable/ad_active_notification_background.xml
#	new file: packages/SystemUI/res/drawable/ic_ad_dismiss_notification.xml
#	new file: packages/SystemUI/res/drawable/ic_ad_target_unlock.xml
#	new file: packages/SystemUI/res/layout-land/active_display_content.xml
#	new file: packages/SystemUI/res/layout/active_display.xml
#	new file: packages/SystemUI/res/layout/active_display_content.xml
#	new file: packages/SystemUI/res/layout/glow_pad_container.xml
#	new file: packages/SystemUI/res/layout/glow_pad_view.xml
#	new file: packages/SystemUI/res/values/vendor_arrays.xml
#	new file: packages/SystemUI/res/values/vendor_dimens.xml
#	new file: packages/SystemUI/res/values/vendor_donottranslate.xml
#	new file: packages/SystemUI/res/values/vendor_styles.xml
#	modified: packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
#	modified: packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
#	new file: packages/SystemUI/src/com/android/systemui/statusbar/policy/activedisplay/ActiveDisplayView.java
#	new file: packages/SystemUI/src/com/android/systemui/statusbar/policy/activedisplay/ClockView.java
#	new file: packages/SystemUI/src/com/android/systemui/statusbar/policy/activedisplay/DummyActivity.java
#	modified: services/java/com/android/server/NotificationManagerService.java
#
# Unmerged paths:
# (use "git add <file>..." to mark resolution)
#
#	both modified: core/res/AndroidManifest.xml
#	both modified: packages/SystemUI/AndroidManifest.xml
#

i'm assuming i have to type following commands:

git add core/res/AndroidManifest.xml

git add packages/SystemUI/AndroidManifest.xml

Here's what I get for one of the packages_apps_Settings cherry-pick:

android@builduntu:~/psx-light/packages/apps/Settings$ git cherry-pick 0e508d62622c403ab99655a1eb7e14b3fcaa18d8
error: could not apply 0e508d6... Add active display to ChameleonOS [2/2]
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
Recorded preimage for 'res/values/arrays.xml'
Recorded preimage for 'res/values/strings.xml'
android@builduntu:~/psx-light/packages/apps/Settings$ git status
# HEAD detached at 311aaf6
# You are currently cherry-picking.
# (fix conflicts and run "git commit")
#
# Changes to be committed:
#
#	new file: res/xml/active_display_settings.xml
#	new file: src/com/android/settings/chameleonos/ActiveDisplaySettings.java
#
# Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
#	both modified: res/values/arrays.xml
#	both modified: res/values/strings.xml
#	deleted by us: res/xml/system_settings.xml
#

Do I also need to "git add" both modified files as well as the one deleted (res/xml/system_settings.xml)?