resolved conflicts for merge of 1153629c to master

Browse Source

Change-Id: I2838fc7e5a428fd52c811087b6c5481cf95eef0e

...

This commit is contained in:

Gilles Debunne

2010-10-06 14:38:27 -07:00

parent 91b7b0a33f 1153629cd6

commit efaa4f075d

2 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

core/res/res/drawable-hdpi/status_bar_close_on.9.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.3 KiB

BIN

core/res/res/drawable-mdpi/status_bar_close_on.9.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 646 B