tree 7f43febc86a75142e4d04deb302f5e786c0c96ff
parent 683e8e17f7c20b54da74c05b3a044f46d4b3bddf
parent 169c19ccb566d72a8ea142afb2550f9c54c5fea9
author Raphael Moll <ralf@android.com> 1308764120 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308764120 -0700

am 169c19cc: Merge "Envsetup: Cygwin doesn\'t have \'ps -o command\'."

* commit '169c19ccb566d72a8ea142afb2550f9c54c5fea9':
  Envsetup: Cygwin doesn't have 'ps -o command'.