tree 35fbb39c893652c434c27e63f1d76101fb17bd36
parent 98569bc7089d84478e4ab39046c0a297358a9603
parent f9db4ab97e58f15f84642ac133e33bd89107c944
author Todd Poynor <toddpoynor@google.com> 1404153045 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404153045 +0000

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

* commit 'f9db4ab97e58f15f84642ac133e33bd89107c944':
  Charger: Avoid animation while not charging DO NOT MERGE