DO NOT MERGE resolved conflicts for merge of 8c11e952 to gingerbread-plus-aosp

Browse Source

Change-Id: I29703133654f0f80a4425914d290e9dc50cbc3cc

...

This commit is contained in:

Jean-Baptiste Queru 2010-08-18 13:20:08 -07:00

parent 8c33c55681 617570672d

commit 1ccb98835a

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

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

Diff Content Not Available