tree e987c9baef0e830ebb6a2f7f1252b5d84d79210e
parent b3962d2405b279abde234e16e5b3bff3a4a5cab5
parent 9033512273129383c8cc78beee61f17b50ffff49
author Mark Salyzyn <salyzyn@google.com> 1484083727 +0000
committer android-build-merger <android-build-merger@google.com> 1484083727 +0000

Merge "liblog: use log/log.h for ALOG macros" am: 06d8feefec am: 71bf335ffa am: 8790fb2613
am: 9033512273

Change-Id: I67837417d7c8fbc2cc5239f903a0cdf3b107558b