| commit | b24ee05ba02eb77494622680e14352b16da51149 | [log] [tgz] |
|---|---|---|
| author | Raphael <raphael@google.com> | Sat Jan 29 08:56:53 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 29 08:56:53 2011 -0800 |
| tree | 799a7d86b1e8a50f86879d7aaacaea56f269be53 | |
| parent | 9ed77afe2c25f9ee1cb31e30914201fcc6e180ec [diff] | |
| parent | 6a691b3ed872ed42d83ef52a0f975cfc5b3c638a [diff] |
am 6a691b3e: resolved conflicts for merge of 1adaa571 to gingerbread-plus-aosp * commit '6a691b3ed872ed42d83ef52a0f975cfc5b3c638a': unix2dos command, used by win SDK, has been renamed under Lucid.