diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2011-09-16 10:52:15 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-16 10:52:15 -0700 |
| commit | ebdcae732f648871dd0df6586a5ba57aae015bd4 (patch) | |
| tree | 37cae125981933631a8acafdbd9ae972b4b7c0fe /data | |
| parent | 1f9a928864be7cfc76c99b8f69706e739e6a7b08 (diff) | |
| parent | 9e15be985ef76be330a08f1211532508b8dcf52d (diff) | |
| download | frameworks_base-ebdcae732f648871dd0df6586a5ba57aae015bd4.zip frameworks_base-ebdcae732f648871dd0df6586a5ba57aae015bd4.tar.gz frameworks_base-ebdcae732f648871dd0df6586a5ba57aae015bd4.tar.bz2 | |
Merge "Add third video to default system videos." into ics-factoryrom
Diffstat (limited to 'data')
| -rw-r--r-- | data/videos/Disco.240p.mp4 | bin | 0 -> 791065 bytes | |||
| -rw-r--r-- | data/videos/Disco.480p.lq.mp4 | bin | 0 -> 1625396 bytes | |||
| -rw-r--r-- | data/videos/Disco.480p.mq.mp4 | bin | 0 -> 3345792 bytes | |||
| -rw-r--r-- | data/videos/VideoPackage1.mk | 5 | ||||
| -rw-r--r-- | data/videos/VideoPackage2.mk | 5 |
5 files changed, 6 insertions, 4 deletions
diff --git a/data/videos/Disco.240p.mp4 b/data/videos/Disco.240p.mp4 Binary files differnew file mode 100644 index 0000000..c9078b7 --- /dev/null +++ b/data/videos/Disco.240p.mp4 diff --git a/data/videos/Disco.480p.lq.mp4 b/data/videos/Disco.480p.lq.mp4 Binary files differnew file mode 100644 index 0000000..411e0d5 --- /dev/null +++ b/data/videos/Disco.480p.lq.mp4 diff --git a/data/videos/Disco.480p.mq.mp4 b/data/videos/Disco.480p.mq.mp4 Binary files differnew file mode 100644 index 0000000..3dc4957 --- /dev/null +++ b/data/videos/Disco.480p.mq.mp4 diff --git a/data/videos/VideoPackage1.mk b/data/videos/VideoPackage1.mk index 1e7096a..407a76e 100644 --- a/data/videos/VideoPackage1.mk +++ b/data/videos/VideoPackage1.mk @@ -23,5 +23,6 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/AndroidInSpace.240p.mp4:$(TARGET_PATH)/AndroidInSpace.240p.mp4 \ $(LOCAL_PATH)/AndroidInSpace.480p.lq.mp4:$(TARGET_PATH)/AndroidInSpace.480p.mp4 \ $(LOCAL_PATH)/Sunset.240p.mp4:$(TARGET_PATH)/Sunset.240p.mp4 \ - $(LOCAL_PATH)/Sunset.480p.lq.mp4:$(TARGET_PATH)/Sunset.480p.mp4 - + $(LOCAL_PATH)/Sunset.480p.lq.mp4:$(TARGET_PATH)/Sunset.480p.mp4 \ + $(LOCAL_PATH)/Disco.240p.mp4:$(TARGET_PATH)/Disco.240p.mp4 \ + $(LOCAL_PATH)/Disco.480p.lq.mp4:$(TARGET_PATH)/Disco.480p.mp4 diff --git a/data/videos/VideoPackage2.mk b/data/videos/VideoPackage2.mk index cb77b3e..c256a2d 100644 --- a/data/videos/VideoPackage2.mk +++ b/data/videos/VideoPackage2.mk @@ -23,5 +23,6 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/AndroidInSpace.240p.mp4:$(TARGET_PATH)/AndroidInSpace.240p.mp4 \ $(LOCAL_PATH)/AndroidInSpace.480p.mq.mp4:$(TARGET_PATH)/AndroidInSpace.480p.mp4 \ $(LOCAL_PATH)/Sunset.240p.mp4:$(TARGET_PATH)/Sunset.240p.mp4 \ - $(LOCAL_PATH)/Sunset.480p.mq.mp4:$(TARGET_PATH)/Sunset.480p.mp4 - + $(LOCAL_PATH)/Sunset.480p.mq.mp4:$(TARGET_PATH)/Sunset.480p.mp4 \ + $(LOCAL_PATH)/Disco.240p.mp4:$(TARGET_PATH)/Disco.240p.mp4 \ + $(LOCAL_PATH)/Disco.480p.mq.mp4:$(TARGET_PATH)/Disco.480p.mp4 |