| commit | 97eaf5a60350a8f68f1ad22f49d9f127bdb55de7 | [log] [tgz] |
|---|---|---|
| author | Dima Zavin <dima@android.com> | Sun Sep 25 22:33:02 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Sep 25 22:33:02 2011 -0700 |
| tree | 79c4f1e9bb38b222e96be32cd25fbf28d824d808 | |
| parent | 5709ac29b37e4d3ccd74bb66b4ad76cac5bec94e [diff] | |
| parent | dcecd4cc775a2fdc0212a0a76b861ee987ec2ef3 [diff] |
am dcecd4cc: resolved conflicts for merge of 0052abda to master * commit 'dcecd4cc775a2fdc0212a0a76b861ee987ec2ef3': charger: update charger UI with official graphics and animation