resolved conflicts for merge of 6c82fe07 to master

Browse Source

Change-Id: I90943867003999f890c66b3f72ec1ccf19b2d6a6

...

This commit is contained in:

Amith Yamasani

2011-06-03 14:34:30 -07:00

parent fffb0b356e 6c82fe07cc

commit 2c6d0d1512

6 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

res/drawable-mdpi/encroid_progress.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 35 KiB

BIN

res/drawable-mdpi/encroid_resignin.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.3 KiB

BIN

res/drawable-mdpi/encroid_waiting.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 56 KiB