resolved conflicts for merge of a9b1e01a to gingerbread-plus-aosp

Browse Source

Change-Id: Ief79eaa532b583d9608701d48464b7afdc493bac

...

This commit is contained in:

Jean-Baptiste Queru

2010-07-23 14:14:07 -07:00

parent 08f2b10c4b a9b1e01afa

commit 5b0f030d0b

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

Diff Content Not Available