tree 645fb42f0ab22a2f5e57e897be554146ee185b8d
parent 63f8f36dbde5203cff62a15b89e6478aaa325374
parent 70a969c6fcb4f1883708b972b1b400524a11dbb7
author Mark Salyzyn <salyzyn@google.com> 1484258818 +0000
committer android-build-merger <android-build-merger@google.com> 1484258818 +0000

Merge "liblog: use log/log.h when utilizing ALOG macros" am: 9a30f044ca
am: 70a969c6fc

Change-Id: I5b2e4fa842edf56ab85c6bcb24997e537c02d5de