OSDN Git Service

Merge "Add memcg related configs to init." am: b84666cbc0 am: 7564622f88
authorRobert Benea <robenea@google.com>
Wed, 19 Jul 2017 01:12:40 +0000 (01:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Jul 2017 01:12:40 +0000 (01:12 +0000)
commiteab1c14aba8e7d8fa1f6bcbaab9ed4c718ad62a2
treee0f2741e235af4f5520a98e6f9495939f3b4b10f
parentdf13c1473dc741d68a0084eb50f07b5150b12f0d
parent5cf308bcdede0a58a4b82b871329a1caf15ce7e1
Merge "Add memcg related configs to init." am: b84666cbc0 am: 7564622f88
am: 5cf308bcde

Change-Id: Ic86a3200b5080438ad6cb33f9bc3f6ff2ecca22b