OSDN Git Service

am 4e3abafc: am 5daf51c0: Merge "jni: 64-bit compile issue"
authorMark Salyzyn <salyzyn@google.com>
Wed, 26 Mar 2014 20:00:13 +0000 (20:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Mar 2014 20:00:13 +0000 (20:00 +0000)
commit959bce3e69b4eb5dcba9ec48d92f21002f9c13b3
tree8e71d7a5a2d69b24aaf5fe6e7d4395098a41fcde
parent39d1b3f0b887f37555924cc3737347b2c4044ce9
parent4e3abafc9400eed38a1e76897b79e923acfaf8ed
am 4e3abafc: am 5daf51c0: Merge "jni: 64-bit compile issue"

* commit '4e3abafc9400eed38a1e76897b79e923acfaf8ed':
  jni: 64-bit compile issue
media/jni/android_mtp_MtpDatabase.cpp