Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
Fix reboot window texts

PS2: move assignment of titleResourceId into the condition and
only query longPressBehavior when it's needed.

Change-Id: I00c3940c2b5472434177e94ab7c72d5fecc61b2e
Framework: Fix build

Fixes problem introduced with http://review.cyanogenmod.org/#/c/32242

Change-Id: I7a0b17522bc8df0324856af3178f757dba8e449a
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
Merge branch 'cm-10.1' of git://github.com/Team-Hydra/android_frameworks_base into cm-10.1