merge in jb-mr1-release history after reset to jb-mr1-dev
merge in jb-mr1-release history after reset to jb-mr1-dev
merge in jb-mr1-release history after reset to jb-mr1-dev
merge in jb-mr1-release history after reset to jb-mr1-dev
mako: allow device to sleep in off-mode charging

In off-mode charging, the device need to go suspend mode
to reduce power consumption after charging completion.
This patch enable suspend mode in off-mode charging.

Bug: 7429504
Change-Id: I915f0d076c34680d2fbfd8e8b92adb65464b1600
mako: reduce the power consumption in off-mode charging

In off-mode charging, we don't need to turn on CPU1 to CPU3.
So we turn off CPU1 to CPU3 in off-mode charging. By doing this
we can save 60mA.

Bug: 7429504

Change-Id: Ie5d58b6258b7b2d084674fa670f3cc41639a6fd2
Signed-off-by: Iliyan Malchev <malchev@google.com>
Merge tag 'android-4.2.1_r1.2' into jb-mr1

Android 4.2.1 release 1.2