OSDN Git Service

am 8bb5e662: am d732f561: am 2c6b048b: am 967c5d00: Merge changes I3659193f,I8b78e4db
authorMark Salyzyn <salyzyn@google.com>
Tue, 28 Jan 2014 21:45:16 +0000 (21:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 Jan 2014 21:45:16 +0000 (21:45 +0000)
commitc0b540dc8744eceabfcf09a45ec964cb9709027a
tree33460f3e3f50b08312860f9d83ca1c6a8b40370c
parent1ece04f37fc93983ee058916e9913b6341e6de83
parent8bb5e66295f4f0f53dce13a877b922dead4639e8
am 8bb5e662: am d732f561: am 2c6b048b: am 967c5d00: Merge changes I3659193f,I8b78e4db

* commit '8bb5e66295f4f0f53dce13a877b922dead4639e8':
  jni: Resolve build warnings
  jni: Incorporate liblog reading API