tree 697716e5257c46ca1bf30432cb6abe289910e9c6
parent ea59036ec810b76688650f2a14178d4ffe4a129c
parent 35dcc67558b63d08c47cd4bb3f989d7a9b77b884
author Mark Salyzyn <salyzyn@google.com> 1476134205 +0000
committer android-build-merger <android-build-merger@google.com> 1476134205 +0000

Merge "define LOG_TAG before including android/log.h"
am: 35dcc67558

Change-Id: Iefdfd1ea0703742ea37d27783c698bc154d30216