am ff3d4bc4: resolved conflicts for merge of 1a6a849b to gingerbread-plus-aosp

Browse Source

* commit 'ff3d4bc42b22093695896bc319c59b139aa2c6f6':
  Disable ccache when use mingw.

...

This commit is contained in:

Ying Wang

2011-03-14 10:53:48 -07:00

committed by Android Git Automerger

parent b2c8dbeafb ff3d4bc42b

commit 65140fc2fc

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