remote: Counting objects: 25629, done.
remote: Compressing objects: 100% (6795/6795), done.
remote: Total 23008 (delta 15545), reused 20763 (delta 13423)
Receiving objects: 100% (23008/23008), 40.55 MiB | 1.56 MiB/s, done.
Resolving deltas: 100% (15545/15545), completed with 917 local objects.
De git://github.com/ParanoidAndroid/android_frameworks_base
* [new branch] PIE2 -> pa/PIE2
* [new branch] hybrid2 -> pa/hybrid2
* [new branch] jellybean -> pa/jellybean
* [new branch] jellybean-legacy -> pa/jellybean-legacy
* [new branch] staging -> pa/staging
aospdanmon@nexus4rom:~/Slim_jb/frameworks/base$ git cherry-pick -m 1 518c329e8c67fa96b8a8fc22e1962ddb8497c333
error: Your local changes to the following files would be overwritten by merge:
core/java/android/app/Activity.java
Please, commit your changes or stash them before you can merge.
Aborting
