| commit | fdb1410e6c895bbc1a299c249e79a5d38c9fbf7c | [log] [tgz] |
|---|---|---|
| author | Raphael <raphael@google.com> | Thu Feb 03 11:34:31 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 03 11:34:31 2011 -0800 |
| tree | 07332a32b8672533296f9cda284d9c8e6a0c977b | |
| parent | a922306a87dea10956d330ed43a5f6b15927854f [diff] | |
| parent | ad402d2b1f4315f31be760d5d2345561059bbe75 [diff] |
am ad402d2b: resolved conflicts for merge of d30ec22e to gingerbread-plus-aosp * commit 'ad402d2b1f4315f31be760d5d2345561059bbe75': SDK: fix win-sdk build errors, make future errors fatal.