tree 8ed73b2f259d22f058b86b88956deb2cb95d7922
parent ab2a91309b32496a6f719d379c47929cca309147
parent 2c0f9c3a72e5170630513d85b1d88ee08e518ca0
author Tim Murray <timmurray@google.com> 1499478771 +0000
committer android-build-merger <android-build-merger@google.com> 1499478771 +0000

Merge "Revert "Use mem cgroups in libprocessgroup if they're available"" am: e8a75e8f76 am: 7f857bb9ff am: ac68c7fc8c
am: 2c0f9c3a72

Change-Id: I36ef31b921d56222902c4bba8f891d6d21dad947