summaryrefslogtreecommitdiffstats
path: root/core/java/android/content/ContentProviderClient.java
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2010-08-11 18:07:42 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-11 18:07:42 -0700
commitaa17f004059fc3b85a6a30e1ae48cbfb4990e005 (patch)
tree735c9e6a8acddf64b8886b52fc557a0689bcd283 /core/java/android/content/ContentProviderClient.java
parentb8244f47053963a89ee1964fd73c859e9863a7c5 (diff)
parent70a7c92e161225f587af453e01d2b124dbf6303f (diff)
downloadframeworks_base-aa17f004059fc3b85a6a30e1ae48cbfb4990e005.zip
frameworks_base-aa17f004059fc3b85a6a30e1ae48cbfb4990e005.tar.gz
frameworks_base-aa17f004059fc3b85a6a30e1ae48cbfb4990e005.tar.bz2
am 70a7c92e: am 65f2490e: Merge "should fix sim build, hopefully" into gingerbread
Merge commit '70a7c92e161225f587af453e01d2b124dbf6303f' * commit '70a7c92e161225f587af453e01d2b124dbf6303f': should fix sim build, hopefully
Diffstat (limited to 'core/java/android/content/ContentProviderClient.java')
0 files changed, 0 insertions, 0 deletions