tree 630963d9c9ec2e087a14fe0373059103eb3c1b9a
parent 4fdfda5cd2b1d8670bdcf6048028f28875710a69
parent c6d07e82302322304c422b768af37255d4098134
author Mark Salyzyn <salyzyn@google.com> 1484264977 +0000
committer android-build-merger <android-build-merger@google.com> 1484264977 +0000

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

Change-Id: Ia3c81c04b689ae06610df61d27627dd66d5f71bd