tree 697716e5257c46ca1bf30432cb6abe289910e9c6
parent 41504d26fe6b20d2a6a7b37bf6966139b8f7f7e1
parent 6f5dc6b03d036695e57f51bdd244a877b80ef90a
author Mark Salyzyn <salyzyn@google.com> 1476136332 +0000
committer android-build-merger <android-build-merger@google.com> 1476136332 +0000

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

Change-Id: I0611b42b0a5c211f5b0bc59d23d1dee2f4c7a7d9