tree dac0c11812de0a60dabd603f2c00e8de6dbee6ec
parent 2a126b05a28abfc8372e7ca6ef5b107a5f635486
parent df01c2cf191b094d55ca3f96ef5621df4cde3b07
author Jeff Vander Stoep <jeffv@google.com> 1532378997 -0700
committer android-build-merger <android-build-merger@google.com> 1532378997 -0700

[automerger skipped] Merge "Check for /dev/memcg/system/tasks before writing to it" am: 36ce625ccf  -s ours
am: df01c2cf19  -s ours

Change-Id: I86e73d2e05ba61e24d7ef2a4efcf0e2147a8723f