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)
commitd732f561b24e643676812855396d0c9b9138b4c8
tree75d7b35190d736af0a61762c650f443b4ee1eccd
parent8773d51eae2a40d95adfe517476e9098eec14166
parent2c6b048bed296949878318a7c60faf247f538e67
am 2c6b048b: am 967c5d00: Merge changes I3659193f,I8b78e4db

* commit '2c6b048bed296949878318a7c60faf247f538e67':
  jni: Resolve build warnings
  jni: Incorporate liblog reading API