summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJustin Ho <justinho@google.com>2011-03-30 15:59:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-30 15:59:19 -0700
commit0b251aec4307d566ebb1a95f8b1136d6d5b8d5a6 (patch)
tree8846e8f75673f58a5f9d90ef9e0d39b6e38cd2bd /core
parentf829305f8706e32fa103e5ee9eef7c595642d1a2 (diff)
parent01b13a11e6492ebba66c496eaefdb008f2638870 (diff)
downloadframeworks_base-0b251aec4307d566ebb1a95f8b1136d6d5b8d5a6.zip
frameworks_base-0b251aec4307d566ebb1a95f8b1136d6d5b8d5a6.tar.gz
frameworks_base-0b251aec4307d566ebb1a95f8b1136d6d5b8d5a6.tar.bz2
am 01b13a11: Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1
* commit '01b13a11e6492ebba66c496eaefdb008f2638870': Replacing browser playback controls for inactive videos Bug: 4136024
Diffstat (limited to 'core')
-rw-r--r--core/res/res/drawable-hdpi/ic_media_video_poster.pngbin701 -> 7060 bytes
-rw-r--r--core/res/res/drawable-ldpi/ic_media_video_poster.pngbin605 -> 3523 bytes
-rwxr-xr-x[-rw-r--r--]core/res/res/drawable-mdpi/ic_media_video_poster.pngbin567 -> 3499 bytes
3 files changed, 0 insertions, 0 deletions
diff --git a/core/res/res/drawable-hdpi/ic_media_video_poster.png b/core/res/res/drawable-hdpi/ic_media_video_poster.png
index 6c1fd6b..77b6b0e 100644
--- a/core/res/res/drawable-hdpi/ic_media_video_poster.png
+++ b/core/res/res/drawable-hdpi/ic_media_video_poster.png
Binary files differ
diff --git a/core/res/res/drawable-ldpi/ic_media_video_poster.png b/core/res/res/drawable-ldpi/ic_media_video_poster.png
index 786d0e6..7b34913 100644
--- a/core/res/res/drawable-ldpi/ic_media_video_poster.png
+++ b/core/res/res/drawable-ldpi/ic_media_video_poster.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/ic_media_video_poster.png b/core/res/res/drawable-mdpi/ic_media_video_poster.png
index 10bbd74..f457f23 100644..100755
--- a/core/res/res/drawable-mdpi/ic_media_video_poster.png
+++ b/core/res/res/drawable-mdpi/ic_media_video_poster.png
Binary files differ