OSDN Git Service

Merge "Add storageId to moveObjects" am: 1f4f6d2a18 am: 18abf57e99
authorJerry Zhang <zhangjerry@google.com>
Thu, 19 Oct 2017 18:36:22 +0000 (18:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Oct 2017 18:36:22 +0000 (18:36 +0000)
commit3b997d077317f536df7597032bc14d1e18e1fe17
tree1185770118fe26af1a3d567d5d83235144a1a746
parent9c6f24d1ee8e2b440ec70262f6c5c0d9a7237e78
parent59ff05a59f334d9d4043b18d1cadbe027c3ff3ad
Merge "Add storageId to moveObjects" am: 1f4f6d2a18 am: 18abf57e99
am: 59ff05a59f

Change-Id: I024be0c75e20e58152dbe0c81e5548d70f06a925
media/java/android/mtp/MtpDatabase.java
media/jni/android_mtp_MtpDatabase.cpp