OSDN Git Service

Merge "Workaround for broken \'ps\' command on M."
authorNicolas Geoffray <ngeoffray@google.com>
Mon, 7 Mar 2016 16:54:17 +0000 (16:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 7 Mar 2016 16:54:17 +0000 (16:54 +0000)
am: b5d31327b2

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


Trivial merge