tree f76509395261b74f2bd9f42705e6c1c19cd37440
parent 9461708ec9c71e393eaee831ba83385f7b82f6aa
parent e961bbcadca5da0ea458da8010f591cadc4fb477
author Suren Baghdasaryan <surenb@google.com> 1533319086 -0700
committer android-build-merger <android-build-merger@google.com> 1533319086 -0700

[automerger skipped] Merge "Enable lmkd kill tracing everywhere"
am: e961bbcadc  -s ours

Change-Id: I8551e637d4aec87c75ff6079040d0cde1b8f248c