tree 8066499ff632ed94ceac58425c74c224d814439a
parent ea84e78b5d14c7691003e468bc09092e8e5f2c7e
parent b5db12586007a036c0b2af7f87c9e821b558613a
author Sasha Smundak <asmundak@google.com> 1549052563 -0800
committer android-build-merger <android-build-merger@google.com> 1549052563 -0800

Merge "Explicitly include log/log.h or android/log.h instead of cutils/log.h"
am: b5db125860

Change-Id: I55fd176e62326df38194486d86a9d3a8f72270ea