ummmm

 * branch            jb         -> FETCH_HEAD
error: could not apply e89ddcf... SystemUI: add signal text (1/2) WIP
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'
Resolved 'core/java/android/provider/Settings.java' using previous resolution.