tree be86b765640bb6adb594d0e03484eb535665fec1
parent 798123ecf9fc3e2ecc5bc8f59d1217cbfdb5c8a5
parent aee3d39ad74ad7bd642671b26c33f68b1288659f
author choongryeol.lee <choongryeol.lee@lge.com> 1360025027 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360025027 -0800

am aee3d39a: am 47cae27d: am d9fa203c: am 1ef9227a: mako: allow device to sleep in off-mode charging

# Via Android Git Automerger (3) and Iliyan Malchev (1)
* commit 'aee3d39ad74ad7bd642671b26c33f68b1288659f':
  mako: allow device to sleep in off-mode charging