tree 1e62e9987973d7892b7f959d2aff32dc28230881
parent 76507a64b530c757dc284f1f4d0807ffbfd9a701
parent 0d8b97a44e4cb5c5cfffd6421eb2cec1ebc00d2f
author Mark Salyzyn <salyzyn@google.com> 1424891592 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424891592 +0000

am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags"

* commit '0d8b97a44e4cb5c5cfffd6421eb2cec1ebc00d2f':
  jni: switch to ANDROID_LOG_* mode flags