summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Ho <justinho@google.com>2011-03-30 16:41:41 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-30 16:41:41 -0700
commitbacdc8108aed0bb100d7109da585fd2882c3abf2 (patch)
tree050df33e167a0434f02bbe08ffcf4b6dea386c96
parent7b3e4c92544904c188b0597fb07562cb5be47c7b (diff)
parent0b3973143191962d3c4372523ed450f6a5bf0863 (diff)
downloadframeworks_base-bacdc8108aed0bb100d7109da585fd2882c3abf2.zip
frameworks_base-bacdc8108aed0bb100d7109da585fd2882c3abf2.tar.gz
frameworks_base-bacdc8108aed0bb100d7109da585fd2882c3abf2.tar.bz2
am 0b397314: am 0b251aec: am 01b13a11: Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1
* commit '0b3973143191962d3c4372523ed450f6a5bf0863': Replacing browser playback controls for inactive videos Bug: 4136024
-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