am d66a92e6: am da882181: Merge "Eliminating dead code with no other effect...
am d66a92e6: am da882181: Merge "Eliminating dead code with no other effect than consuming battery life."
* commit 'd66a92e6':
Eliminating dead code with no other effect than consuming battery life.