| commit | b26b1274edbc98971ccfd302c05655a4d019baa1 | [log] [tgz] |
|---|---|---|
| author | Raphael <raphael@google.com> | Tue Nov 23 15:39:37 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 23 15:39:37 2010 -0800 |
| tree | ea7e03a5763eebe08074369d9e3001830aa09660 | |
| parent | d05fe2dfe94206f75c8413c51c1d5726cd4fa2e0 [diff] | |
| parent | a65f76962f475c9c187dd63dca36e59eff84dcca [diff] |
am a65f7696: resolved conflicts for merge of f0f624f3 to gingerbread-plus-aosp * commit 'a65f76962f475c9c187dd63dca36e59eff84dcca': Win SDK: Split the win-sdk makefile and script into 2 parts.