summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2009-08-20 16:00:56 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-08-20 16:00:56 -0700
commit42c7eaa6bc522f31fe19a9cdfeb953f511ec1fa2 (patch)
tree5548c3ceb67935cc011fff537ccf8e387bd980c6
parentc22870b7ba5c4c9d8941304888a048fa8d89541c (diff)
parentfab096cbcf98cb98eef25e7541121ae8e3898a10 (diff)
downloadandroid_development-42c7eaa6bc522f31fe19a9cdfeb953f511ec1fa2.tar.gz
android_development-42c7eaa6bc522f31fe19a9cdfeb953f511ec1fa2.tar.bz2
android_development-42c7eaa6bc522f31fe19a9cdfeb953f511ec1fa2.zip
am fab096cb: Merge change 22103 into donut
Merge commit 'fab096cbcf98cb98eef25e7541121ae8e3898a10' into eclair * commit 'fab096cbcf98cb98eef25e7541121ae8e3898a10': new transparent icon for searchable dictionary
-rw-r--r--samples/SearchableDictionary/res/drawable/ic_dictionary.gifbin1132 -> 0 bytes
-rw-r--r--samples/SearchableDictionary/res/drawable/ic_dictionary.pngbin0 -> 5810 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/samples/SearchableDictionary/res/drawable/ic_dictionary.gif b/samples/SearchableDictionary/res/drawable/ic_dictionary.gif
deleted file mode 100644
index 47cdfc2bb..000000000
--- a/samples/SearchableDictionary/res/drawable/ic_dictionary.gif
+++ /dev/null
Binary files differ
diff --git a/samples/SearchableDictionary/res/drawable/ic_dictionary.png b/samples/SearchableDictionary/res/drawable/ic_dictionary.png
new file mode 100644
index 000000000..64eb29436
--- /dev/null
+++ b/samples/SearchableDictionary/res/drawable/ic_dictionary.png
Binary files differ