am ad402d2b: resolved conflicts for merge of d30ec22e to gingerbread-plus-aosp

Browse Source

* commit 'ad402d2b1f4315f31be760d5d2345561059bbe75':
  SDK: fix win-sdk build errors, make future errors fatal.

...

This commit is contained in:

Raphael

2011-02-03 11:34:31 -08:00

committed by Android Git Automerger

parent a922306a87 ad402d2b1f

commit fdb1410e6c

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