| commit | 0f41d453537093115ba1a5c1bc076fa5c5207b5e | [log] [tgz] |
|---|---|---|
| author | Todd Poynor <toddpoynor@google.com> | Mon Jun 30 18:36:06 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 30 18:36:06 2014 +0000 |
| tree | e71be3383b51455f6b8bddbde77ae1ad702354b2 | |
| parent | 7742d9bf292b3ab8bdefc90f66f40c1d4b547e3a [diff] | |
| parent | 092954dec1df391274217a99d623d16fd01d0347 [diff] |
am 092954de: (-s ours) am f9db4ab9: (-s ours) am d4d1b504: (-s ours) Merge "Charger: Avoid animation while not charging DO NOT MERGE" * commit '092954dec1df391274217a99d623d16fd01d0347': Charger: Avoid animation while not charging DO NOT MERGE