OSDN Git Service

am 2c6b048b: am 967c5d00: Merge changes I3659193f,I8b78e4db
authorMark Salyzyn <salyzyn@google.com>
Tue, 28 Jan 2014 21:38:43 +0000 (21:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 Jan 2014 21:38:43 +0000 (21:38 +0000)
* commit '2c6b048bed296949878318a7c60faf247f538e67':
  jni: Resolve build warnings
  jni: Incorporate liblog reading API


Trivial merge