jenkins-84@MintBox ~/Desktop/device_sony_shinano-common $ git fetch ssh://jenkins-84@review.slimroms.org:29418/SlimRoms/device_sony_shinano-common refs/changes/57/8757/3 && git cherry-pick FETCH_HEAD
remote: Counting objects: 10, done
remote: Finding sources: 100% (6/6)
remote: Total 6 (delta 2), reused 3 (delta 2)
Unpacking objects: 100% (6/6), done.
From ssh://review.slimroms.org:29418/SlimRoms/device_sony_shinano-common
 * branch            refs/changes/57/8757/3 -> FETCH_HEAD
error: could not apply e60aab0... shinano: Add TWRP Support
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'
jenkins-84@MintBox ~/Desktop/device_sony_shinano-common $ git add *
jenkins-84@MintBox ~/Desktop/device_sony_shinano-common $ git log
commit d0ad76168016935769f2bc44d534c4e28854970e
Author: Chirayu Desai <chirayudesai1@gmail.com>
Date:   Fri Jul 3 22:58:33 2015 +0530

    nfc: Set device path

    * No need to symlink anymore.

    Change-Id: I070f2ce24846ff4b4e4c7560bd4d9ffb3d7e7db3

commit 45d635a1dadae0e9e545768c6cf016ff22bd78e2
Author: Ethan Chen <intervigil@gmail.com>
Date:   Sun Jun 7 12:02:33 2015 -0700

    shinano: Clean up TFA9890 helper library

    Change-Id: I6c238042f2d15e621aa25fc8edac6f8169ea0e1c

commit 07f4df4a87c4c96fdd2c5be5b8de619651f70f68
Author: Giulio Cervera <giulio.cervera@cyanogenmod.org>
Date:   Mon Jun 1 14:27:45 2015 +0200

    start taimport once

: