commit | 6433a86f3817908e0ef270cbc3b2251708714b93 | [log] [tgz] |
---|---|---|
author | Peter Collingbourne <pcc@google.com> | Thu Nov 01 11:13:36 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Nov 01 11:13:36 2018 -0700 |
tree | da73f599084862c7cca12e96ce2d38b89cf3c0db | |
parent | 8c8d6fe46df95446bb327661530d602aa6b52299 [diff] | |
parent | 825cb7d358f3f0dee93e2ebbfb266b85c622fbf7 [diff] |
Merge "Introduce additional service options for controlling memory cgroups." am: 166ae693d4 am: bf90eac006 Change-Id: I1313428b2cc358a62d3514a9d3a5c9bf260995ba