Alguna ayuda con both modified: core/java/android/provider/Settings.java
Nose donde colocar el codigo de halo
sALUDOS
Ya queda menos
nmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both modified: packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
# both modified: packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java
# both modified: packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
# deleted by us: packages/SystemUI/src/com/android/systemui/statusbar/view/PieStatusPanel.java
# both modified: services/java/com/android/server/NotificationManagerService.java
# both modified: services/java/com/android/server/am/ActivityRecord.java
# both modified: services/java/com/android/server/am/ActivityStack.java
#