Merge branch 'qcril' into cm-10.2

Conflicts:
       core/java/android/provider/Settings.java
       core/res/res/values/strings.xml
       packages/SystemUI/res/layout/signal_cluster_view.xml
       packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
       packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
       packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
       packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
       services/java/com/android/server/power/ShutdownThread.java

PLEASE DO NOT CHANGE OUR COMMIT MSG IF YOU'RE NOT A PAC DEV!!! I left those for a reason!

Change-Id: I3c4061a1f6b563c79001659b5b8d4727969a2b29
Add missing layouts

Change-Id: If59352aa09cfe98339c487a3d6ff0f67ba62066f
Derp fix

Change-Id: I2488691d31575bf1c7f019c0cca5652fe0d924b6
Update some IDs

Change-Id: I5fa7a10c092e683215fa70f53436718201fd4b09
Signed-off-by: Nick0703 <lokesh.c703@gmail.com>
Major FIX! I hate CM!

PS3: Cleanup
PS4: Remove whitespace

Change-Id: I6e9576600a6f97c33472436475ec3ec797ab1745
Signed-off-by: Nick0703 <lokesh.c703@gmail.com>