OSDN Git Service

am 97cae3ea: am c0b540dc: am 8bb5e662: am d732f561: am 2c6b048b: am 967c5d00: Merge...
authorMark Salyzyn <salyzyn@google.com>
Wed, 29 Jan 2014 13:01:44 +0000 (05:01 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Jan 2014 13:01:44 +0000 (05:01 -0800)
commit5e4d998cc846d207c7c8d9f305092a2574a51f92
tree31dee36ef53b3984f83f478571236a56c96e753b
parente6edbe4fa6ddbfc49ff1e4bbe0c8bc534e81554f
parent97cae3eae6c9abbd74ff4206dcaba350caafb99b
am 97cae3ea: am c0b540dc: am 8bb5e662: am d732f561: am 2c6b048b: am 967c5d00: Merge changes I3659193f,I8b78e4db

* commit '97cae3eae6c9abbd74ff4206dcaba350caafb99b':
  jni: Resolve build warnings
  jni: Incorporate liblog reading API