tree 697716e5257c46ca1bf30432cb6abe289910e9c6
parent 124398c834bfce6b4a6e82ac942179b03c90ed6f
parent bf14626be306849488aacc171a8e85a0dead645b
author Mark Salyzyn <salyzyn@google.com> 1476139295 +0000
committer android-build-merger <android-build-merger@google.com> 1476139295 +0000

Merge "define LOG_TAG before including android/log.h" am: 35dcc67558 am: 6f5dc6b03d am: ea6bae3f7c
am: bf14626be3

Change-Id: I22118554f60130018dc4144e64d12492e674828b