summaryrefslogtreecommitdiffstats
path: root/media/jni/android_mtp_MtpDatabase.cpp
diff options
context:
space:
mode:
authorVineeta Srivastava <vsrivastava@google.com>2014-03-07 21:12:17 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-07 21:12:17 +0000
commitf066adde7a3722deba0226715af695537511271e (patch)
tree2270184838edfe7525d93b133bf21ec8cb949bc9 /media/jni/android_mtp_MtpDatabase.cpp
parent3d924f1e8d4664d47a1e5e3045ec450a36bb7009 (diff)
parentdbeb0c12950e92a59671f8da7952ddf3486789b4 (diff)
downloadframeworks_base-f066adde7a3722deba0226715af695537511271e.zip
frameworks_base-f066adde7a3722deba0226715af695537511271e.tar.gz
frameworks_base-f066adde7a3722deba0226715af695537511271e.tar.bz2
am dbeb0c12: Merge "telephony: Add same named operator configuration for some operators" into klp-dev
* commit 'dbeb0c12950e92a59671f8da7952ddf3486789b4': telephony: Add same named operator configuration for some operators
Diffstat (limited to 'media/jni/android_mtp_MtpDatabase.cpp')
0 files changed, 0 insertions, 0 deletions