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

Browse Source

Change-Id: Ibd9f488a0331c472a852054af5db06f8e7d35e76

...

This commit is contained in:

Jean-Baptiste Queru

2010-07-26 10:22:58 -07:00

parent 14d9c34ccb b237bdb647

commit bd01583d6e

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