tree c6b7453af16bbc67bf938aa541fe94a0983cd19f
parent 15858efcc06958f58bd8a3a920603ce54035f39b
parent d1951777df2c22cfc47fbbdfe79a5abf23f6969f
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579131166 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579131166 +0000

[automerger skipped] Merge "Add lmkd atoms to lmkd log_from_module" am: d40f090891 am: 374820d164 am: d1951777df -s ours
am skip reason: Change-Id I5e3ae2a0ec18c907901353f1d943500ce12a7a55 with SHA-1 79f068c1ae is in history

Change-Id: Idd8ba59387369d30ec4fe263b1731005f2a52e96