tree b712a667df0b704aad4196d151949543f0db28b2
parent 19d9d66dc5e243fa66b73aab23f14beb915fd846
parent 504a7cafc5ea67f8cca8f4014b864664c69178b7
author Suren Baghdasaryan <surenb@google.com> 1596074582 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596074582 +0000

[automerger skipped] lmkd: Set default kill timeout to limit waits for uninterruptible processes am: dd8c2c181b am: 504a7cafc5 -s ours

am skip reason: Change-Id Ia280dc095df9ca8494278e0a75b976ed93fc04ae with SHA-1 dd8c2c181b is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/12245883

Change-Id: I3cbc899106a37001e4e09c6b0223086a43c96e00