commit | d22bcf2a2cab9f99945b5172ec26f380c8f8add6 | [log] [tgz] |
---|---|---|
author | Raphael <raphael@google.com> | Thu Feb 03 18:07:40 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 03 18:07:40 2011 -0800 |
tree | b0b45b4c00cd0413a5084e11388d5bec5b3e34cc | |
parent | 8c3366529ab7dc71abd7c5bb478a9c55a0900f6b [diff] | |
parent | fdb1410e6c895bbc1a299c249e79a5d38c9fbf7c [diff] |
am fdb1410e: am ad402d2b: resolved conflicts for merge of d30ec22e to gingerbread-plus-aosp * commit 'fdb1410e6c895bbc1a299c249e79a5d38c9fbf7c': SDK: fix win-sdk build errors, make future errors fatal.