tree 35316108c0f8de09095efa8cec505af07c6f8b26
parent 2b9dd9e1c5b43b5c667cbb7a53ae57d0a2034f56
parent 33807cd6c2c1db1ac7389d3e415297441fcad1da
author Mark Salyzyn <salyzyn@google.com> 1484265278 +0000
committer android-build-merger <android-build-merger@google.com> 1484265278 +0000

Merge "liblog: use log/log.h for ALOG macros" am: dd9fa24091 am: 112d1dcd95
am: 33807cd6c2

Change-Id: I341970b6ddb6610418d85a378ef2984861858c65