charger fix

Change-Id: I8f2f4d15e225e0e4939165b82d20cf174404e6bb
revert

Change-Id: I6153202e20c419b5f9569446ff70d62d8b40b593
Merge pull request #1 from jied83/jellybean

Jellybean