From: Nicolas Geoffray <ngeoffray@google.com>
Date: Mon, 7 Mar 2016 16:54:17 +0000 (+0000)
Subject: Merge "Workaround for broken \'ps\' command on M."
X-Git-Tag: android-x86-7.1-r1~340^2~24^2~43
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c7576ae0cb;p=android-x86%2Fart.git

Merge "Workaround for broken \'ps\' command on M."
am: b5d31327b2

* commit 'b5d31327b2fa96918a255f78a930f64759fa3130':
  Workaround for broken 'ps' command on M.
---

c7576ae0cb2ad044ebf911ad09188fd690785c93