am f9db4ab9: (-s ours) am d4d1b504: (-s ours) Merge "Charger: Avoid animation...
am f9db4ab9: (-s ours) am d4d1b504: (-s ours) Merge "Charger: Avoid animation while not charging DO NOT MERGE"
* commit 'f9db4ab9':
Charger: Avoid animation while not charging DO NOT MERGE