OSDN Git Service

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

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


Trivial merge