Merge "resolved conflicts for merge of 8064dd22 to master"

Browse Source

...

This commit is contained in:

Gilles Debunne

2010-09-30 11:55:39 -07:00

committed by Android (Google) Code Review

parent 20e987bfc3 09f1612885

commit 7d667fb5c9

1 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_e.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.0 KiB After Width:  |  Height:  |  Size: 1.8 KiB