En la rama cm-12.0-test
Your branch is up-to-date with 'origin/cm-12.0-test'.

You are currently cherry-picking commit 17a90cc.

nothing to commit, working directory clean
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git reset'