tree bb6de0c85ef1ce2b2122a08c1d832af61966dc2e
parent e6d4e09c44f4e9c4333398df6e3a2fc4b65bc596
parent 0610e6ad5641e5eec8f4db5e8cae8839498bb8a3
author Mark Salyzyn <salyzyn@google.com> 1484331586 +0000
committer android-build-merger <android-build-merger@google.com> 1484331586 +0000

Merge "liblog: use log/log.h when utilizing ALOG macros" am: bc47cb1dc6
am: 0610e6ad56

Change-Id: Ifd80582ea416eeb60ad03240e35730d076967792