summaryrefslogtreecommitdiffstats
path: root/core/java/android/content/ContentProviderClient.java
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2014-11-24 18:24:23 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-24 18:24:23 +0000
commit44b769d0103df57ccf16f84e037af7d44950aa0a (patch)
tree6fe53c2debace3c5e83b182f98bcc21d4840f161 /core/java/android/content/ContentProviderClient.java
parentc9f499d2f1cd598b90bfb8c13e505354555caea8 (diff)
parent3a013dab155acafab6a80e6b13a82252b69abd9f (diff)
downloadframeworks_base-44b769d0103df57ccf16f84e037af7d44950aa0a.zip
frameworks_base-44b769d0103df57ccf16f84e037af7d44950aa0a.tar.gz
frameworks_base-44b769d0103df57ccf16f84e037af7d44950aa0a.tar.bz2
am 3a013dab: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '3a013dab155acafab6a80e6b13a82252b69abd9f': Import translations. DO NOT MERGE
Diffstat (limited to 'core/java/android/content/ContentProviderClient.java')
0 files changed, 0 insertions, 0 deletions