tree 31ff51cf9f6236763da0e286a066b4c8e9bab829
parent 94d6dfee04b15e4605ad66308b7008d71a50859e
parent 0d13de9fd77f2b64c0d96ce58f3ead40a473c374
author Mark Salyzyn <salyzyn@google.com> 1484183274 +0000
committer android-build-merger <android-build-merger@google.com> 1484183274 +0000

Merge "liblog: use log/log.h when utilizing ALOG macros" am: 1c10b4ec13 am: ab92bfe4dd
am: 0d13de9fd7

Change-Id: Id08cda97a8e8b613758d97257512432efcff3f24