tree 820086bb36f0f8975f7462ca0795bd8d02711671
parent 2c47cd273eb0a39aa4f11b67ea2c0156990bf167
parent 15b18326b67cde4bfe1d71f7a4e703c411dec2e5
author Mark Salyzyn <salyzyn@google.com> 1484265128 +0000
committer android-build-merger <android-build-merger@google.com> 1484265128 +0000

Merge "liblog: use log/log.h for ALOG macros" am: 59cfe7de39 am: c6d07e8230
am: 15b18326b6

Change-Id: I5f4906534e4b892566776b8ee0f005fb6543c283