summaryrefslogtreecommitdiffstats
path: root/core/java/android/content/ContentProvider.java
diff options
context:
space:
mode:
authorFred Quintana <fredq@google.com>2009-12-07 17:04:40 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-07 17:04:40 -0800
commit18ff0e329b314e033e4bfb92b24ecab961f0eb99 (patch)
treec81d4d5bfd71b867860198641ce0265b293e6b13 /core/java/android/content/ContentProvider.java
parentb08170ad7e4ca4908852b0e20759ea740b338a03 (diff)
parent1067c3cbab73a4bc75a2ebd2e3c51077db96fa24 (diff)
downloadframeworks_base-18ff0e329b314e033e4bfb92b24ecab961f0eb99.zip
frameworks_base-18ff0e329b314e033e4bfb92b24ecab961f0eb99.tar.gz
frameworks_base-18ff0e329b314e033e4bfb92b24ecab961f0eb99.tar.bz2
am 1067c3cb: Merge change Ia5ef9acd into eclair
Merge commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24' into eclair-mr2 * commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24': remove an old STOPSHIP comment
Diffstat (limited to 'core/java/android/content/ContentProvider.java')
0 files changed, 0 insertions, 0 deletions