diff options
| author | Dima Zavin <dima@android.com> | 2011-09-25 22:27:13 -0700 |
|---|---|---|
| committer | Dima Zavin <dima@android.com> | 2011-09-25 22:27:13 -0700 |
| commit | dcecd4cc775a2fdc0212a0a76b861ee987ec2ef3 (patch) | |
| tree | 87dbed8aa60e93d620bb061566f9cc9747d98837 /charger/images/battery_1.png | |
| parent | a031a91b9518af9a38290713b0c2126d9b8f6cde (diff) | |
| parent | 0052abdafd7179fc4a7458f09d2f95c74dda0021 (diff) | |
| download | core-dcecd4cc775a2fdc0212a0a76b861ee987ec2ef3.tar.gz core-dcecd4cc775a2fdc0212a0a76b861ee987ec2ef3.tar.bz2 core-dcecd4cc775a2fdc0212a0a76b861ee987ec2ef3.zip | |
resolved conflicts for merge of 0052abda to master
Change-Id: Ia33ac80949bebaafd1a012b7b131dc3960eca862
Diffstat (limited to 'charger/images/battery_1.png')
| -rw-r--r-- | charger/images/battery_1.png | bin | 0 -> 1290 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/charger/images/battery_1.png b/charger/images/battery_1.png Binary files differnew file mode 100644 index 000000000..d9098155f --- /dev/null +++ b/charger/images/battery_1.png |