commit | 1a1c4acfdfded0504c04402dcfc8fb3f08e0008e | [log] [tgz] |
---|---|---|
author | Peter Collingbourne <pcc@google.com> | Thu Nov 01 11:18:32 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Nov 01 11:18:32 2018 -0700 |
tree | 22d3bb974da4b56c65d0cf68feceb7e9a3507b5c | |
parent | 6aa69f29889d4e9e80ad334eff0ad8fa64a7b4a4 [diff] | |
parent | 6433a86f3817908e0ef270cbc3b2251708714b93 [diff] |
Merge "Introduce additional service options for controlling memory cgroups." am: 166ae693d4 am: bf90eac006 am: 573709604d Change-Id: I7c4c71483c42e8d41b517b63bbf467b456d9970e