tree 3ce547989a44c8db3ff8cb1d4c0833f10d86b77e
parent 4f9479bfdbc38e9bc06a5cf0a4bf67214fb358a8
parent 7f5a314ab6dacb72eb37c87e064b21dbd44ccc7b
author Raphael Moll <ralf@android.com> 1308764401 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308764401 -0700

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

* commit '7f5a314ab6dacb72eb37c87e064b21dbd44ccc7b':
  Envsetup: Cygwin doesn't have 'ps -o command'.