tree 799a7d86b1e8a50f86879d7aaacaea56f269be53
parent 9ed77afe2c25f9ee1cb31e30914201fcc6e180ec
parent 6a691b3ed872ed42d83ef52a0f975cfc5b3c638a
author Raphael <raphael@google.com> 1296320213 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296320213 -0800

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.