tree e0f2741e235af4f5520a98e6f9495939f3b4b10f
parent df13c1473dc741d68a0084eb50f07b5150b12f0d
parent 5cf308bcdede0a58a4b82b871329a1caf15ce7e1
author Robert Benea <robenea@google.com> 1500426760 +0000
committer android-build-merger <android-build-merger@google.com> 1500426760 +0000

Merge "Add memcg related configs to init." am: b84666cbc0 am: 7564622f88
am: 5cf308bcde

Change-Id: Ic86a3200b5080438ad6cb33f9bc3f6ff2ecca22b