Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
core: use Long.parseLong to parse Fat Volume UUID

Integer.parseInt will fail on UUID such as "FEDC-9876"

Change-Id: I06cb340de6b89b3d7afe30327fd21fd3b46da5cf
keyguard: fix-fix layout for sw320dp devices

Default values need to be defined in sw360dp or larger devices will
pick up sw320dp values automatically.

On the maguro device the keyguard isn't properly centered.

- Before http://review.cyanogenmod.org/54758:
    http://i.imgur.com/F6sokhA.jpg
- After http://review.cyanogenmod.org/54758:
    http://i.imgur.com/OdTkZLL.jpg
- With this commit:
    http://i.imgur.com/TThq9da.jpg

Change-Id: Idcc29ec79a12e61b26d2ad5070468e70a8ef39df
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Frameworks: PT-BR Translations

Change-Id: Ib3260dc709f54016c33ee306de7d78774dba2084
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Revert "core: use Long.parseLong to parse Fat Volume UUID"

This reverts commit ca372be0f41741c86eb388690a9584dab3a8fb4f.
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
base: Add dock battery support

Dock battery patchset chain:
base: http://review.cyanogenmod.org/#/c/55349/
native: http://review.cyanogenmod.org/#/c/55028/
healthd: http://review.cyanogenmod.org/#/c/55029/
settings: http://review.cyanogenmod.org/#/c/55212/
tf700t: http://review.cyanogenmod.org/#/c/55030/

Video (battery styles): https://www.dropbox.com/s/a7dp3glb7lv1zcg/dock_sdcard01.mp4
Screenshots:
 * No dock: https://www.dropbox.com/s/2yvngdaqok32xiz/dock_sdcard01.png?m=
 * No charging: https://www.dropbox.com/s/ezghtgoedei17oj/dock_sdcard02.png?m=
 * Docked no charging: https://www.dropbox.com/s/7fasc05fw5ylfxi/dock_sdcard03.png?m=
 * Docked charging: https://www.dropbox.com/s/x37vrhxzd075f7p/dock_sdcard04.png?m=

Fix landscape battery:
https://www.dropbox.com/s/nlufek6gmwrjvyn/dock_fix1.png
https://www.dropbox.com/s/yo5y026o9piwil8/dock_fix2.png

Fix: battery history graph
https://www.dropbox.com/s/jkf7uioupyl05x7/Screenshot_2013-12-12-04-03-38.png

Change-Id: Ia36dbc5c76bf5e256d660e4594ca1169eeb3f00b
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
base: Remove duplicated key handling

Change-Id: Ifd8ecac2b3758f0c6a4dbaa39350831af0b145a0
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0