Update soundscape for L, using classic names. (partial revert of commit 7348f744) Bug: 15725449 Change-Id: Ic1a038c906deab035f96caed42fc16c59d459965

commit: f56a3454821b9b15174d8b03eab229b52c88f547 [log] [tgz]
author: Dan Sandler <dsandler@android.com> Thu Aug 28 00:37:18 2014 -0400
committer: Dan Sandler <dsandler@android.com> Thu Aug 28 00:40:26 2014 -0400
tree: 2ef99b412084c04712bbc09a1af53bf3f9e6dc41
parent: 5232271a41323594ae406be7476b6ca2f08af3d8 [diff]
diff --git a/data/sounds/AudioPackage13.mk b/data/sounds/AudioPackage13.mk
index 57fe762..9bbfa7f 100644
--- a/data/sounds/AudioPackage13.mk
+++ b/data/sounds/AudioPackage13.mk

@@ -8,12 +8,10 @@
 LOCAL_PATH := frameworks/base/data/sounds
 
 # Simple files that do not require renaming
-ALARM_FILES := Alarm1 Alarm2 Alarm3 Alarm4 Alarm5 Alarm6 Alarm7 Alarm8 Timer
-NOTIFICATION_FILES := Notification1 Notification2 Notification3 Notification4 \
-	Notification5 Notification6 Notification7 Notification8 Notification9 \
-	Notification10 Notification11
-RINGTONE_FILES := Ringtone1 Ringtone2 Ringtone3 Ringtone4 Ringtone5 Ringtone6 \
-	Ringtone7 Ringtone8 Ringtone9 Ringtone10 Ringtone11 Ringtone12
+ALARM_FILES := Argon Carbon Helium Krypton Neon Oxygen Osmium Platinum Timer
+NOTIFICATION_FILES := Ariel Ceres Carme Elara Europa Iapetus Io Rhea Salacia Titan Tethys
+RINGTONE_FILES := Atria Callisto Dione Ganymede Luna Oberon Phobos Pyxis Sedna Titania Triton \
+	Umbriel
 EFFECT_FILES := Effect_Tick KeypressReturn KeypressInvalid KeypressDelete KeypressSpacebar KeypressStandard \
 	camera_click camera_focus Dock Undock Lock Unlock Trusted
 MATERIAL_EFFECT_FILES := VideoRecord WirelessChargingStarted LowBattery

diff --git a/data/sounds/AudioPackage13_48.mk b/data/sounds/AudioPackage13_48.mk
index 187bccb..b90cd00 100644
--- a/data/sounds/AudioPackage13_48.mk
+++ b/data/sounds/AudioPackage13_48.mk

@@ -8,12 +8,10 @@
 LOCAL_PATH := frameworks/base/data/sounds
 
 # Simple files that do not require renaming
-ALARM_FILES := Alarm1 Alarm2 Alarm3 Alarm4 Alarm5 Alarm6 Alarm7 Alarm8 Timer
-NOTIFICATION_FILES := Notification1 Notification2 Notification3 Notification4 \
-	Notification5 Notification6 Notification7 Notification8 Notification9 \
-	Notification10 Notification11
-RINGTONE_FILES := Ringtone1 Ringtone2 Ringtone3 Ringtone4 Ringtone5 Ringtone6 \
-	Ringtone7 Ringtone8 Ringtone9 Ringtone10 Ringtone11 Ringtone12
+ALARM_FILES := Argon Carbon Helium Krypton Neon Oxygen Osmium Platinum Timer
+NOTIFICATION_FILES := Ariel Ceres Carme Elara Europa Iapetus Io Rhea Salacia Titan Tethys
+RINGTONE_FILES := Atria Callisto Dione Ganymede Luna Oberon Phobos Pyxis Sedna Titania Triton \
+	Umbriel
 EFFECT_FILES := Effect_Tick KeypressReturn KeypressInvalid KeypressDelete KeypressSpacebar KeypressStandard \
 	camera_click Lock Unlock Trusted
 MATERIAL_EFFECT_FILES := VideoRecord WirelessChargingStarted LowBattery

diff --git a/data/sounds/alarms/material/ogg/Alarm1.ogg b/data/sounds/alarms/material/ogg/Argon.ogg
similarity index 100%
rename from data/sounds/alarms/material/ogg/Alarm1.ogg
rename to data/sounds/alarms/material/ogg/Argon.ogg
Binary files differ

diff --git a/data/sounds/alarms/material/ogg/Alarm1_48k.ogg b/data/sounds/alarms/material/ogg/Argon_48k.ogg
similarity index 100%
rename from data/sounds/alarms/material/ogg/Alarm1_48k.ogg
rename to data/sounds/alarms/material/ogg/Argon_48k.ogg
Binary files differ

diff --git a/data/sounds/alarms/material/ogg/Alarm2.ogg b/data/sounds/alarms/material/ogg/Carbon.ogg
similarity index 100%
rename from data/sounds/alarms/material/ogg/Alarm2.ogg
rename to data/sounds/alarms/material/ogg/Carbon.ogg
Binary files differ

diff --git a/data/sounds/alarms/material/ogg/Alarm2_48k.ogg b/data/sounds/alarms/material/ogg/Carbon_48k.ogg
similarity index 100%
rename from data/sounds/alarms/material/ogg/Alarm2_48k.ogg
rename to data/sounds/alarms/material/ogg/Carbon_48k.ogg
Binary files differ

diff --git a/data/sounds/alarms/material/ogg/Alarm3.ogg b/data/sounds/alarms/material/ogg/Helium.ogg
similarity index 100%
rename from data/sounds/alarms/material/ogg/Alarm3.ogg
rename to data/sounds/alarms/material/ogg/Helium.ogg
Binary files differ

diff --git a/data/sounds/alarms/material/ogg/Alarm3_48k.ogg b/data/sounds/alarms/material/ogg/Helium_48k.ogg
similarity index 100%
rename from data/sounds/alarms/material/ogg/Alarm3_48k.ogg
rename to data/sounds/alarms/material/ogg/Helium_48k.ogg
Binary files differ

diff --git a/data/sounds/alarms/material/ogg/Alarm4.ogg b/data/sounds/alarms/material/ogg/Krypton.ogg
similarity index 100%
rename from data/sounds/alarms/material/ogg/Alarm4.ogg
rename to data/sounds/alarms/material/ogg/Krypton.ogg
Binary files differ

diff --git a/data/sounds/alarms/material/ogg/Alarm4_48k.ogg b/data/sounds/alarms/material/ogg/Krypton_48k.ogg
similarity index 100%
rename from data/sounds/alarms/material/ogg/Alarm4_48k.ogg
rename to data/sounds/alarms/material/ogg/Krypton_48k.ogg
Binary files differ

diff --git a/data/sounds/alarms/material/ogg/Alarm5.ogg b/data/sounds/alarms/material/ogg/Neon.ogg
similarity index 100%
rename from data/sounds/alarms/material/ogg/Alarm5.ogg
rename to data/sounds/alarms/material/ogg/Neon.ogg
Binary files differ

diff --git a/data/sounds/alarms/material/ogg/Alarm5_48k.ogg b/data/sounds/alarms/material/ogg/Neon_48k.ogg
similarity index 100%
rename from data/sounds/alarms/material/ogg/Alarm5_48k.ogg
rename to data/sounds/alarms/material/ogg/Neon_48k.ogg
Binary files differ

diff --git a/data/sounds/alarms/material/ogg/Alarm6.ogg b/data/sounds/alarms/material/ogg/Osmium.ogg
similarity index 100%
rename from data/sounds/alarms/material/ogg/Alarm6.ogg
rename to data/sounds/alarms/material/ogg/Osmium.ogg
Binary files differ

diff --git a/data/sounds/alarms/material/ogg/Alarm6_48k.ogg b/data/sounds/alarms/material/ogg/Osmium_48k.ogg
similarity index 100%
rename from data/sounds/alarms/material/ogg/Alarm6_48k.ogg
rename to data/sounds/alarms/material/ogg/Osmium_48k.ogg
Binary files differ

diff --git a/data/sounds/alarms/material/ogg/Alarm7.ogg b/data/sounds/alarms/material/ogg/Oxygen.ogg
similarity index 100%
rename from data/sounds/alarms/material/ogg/Alarm7.ogg
rename to data/sounds/alarms/material/ogg/Oxygen.ogg
Binary files differ

diff --git a/data/sounds/alarms/material/ogg/Alarm7_48k.ogg b/data/sounds/alarms/material/ogg/Oxygen_48k.ogg
similarity index 100%
rename from data/sounds/alarms/material/ogg/Alarm7_48k.ogg
rename to data/sounds/alarms/material/ogg/Oxygen_48k.ogg
Binary files differ

diff --git a/data/sounds/alarms/material/ogg/Alarm8.ogg b/data/sounds/alarms/material/ogg/Platinum.ogg
similarity index 100%
rename from data/sounds/alarms/material/ogg/Alarm8.ogg
rename to data/sounds/alarms/material/ogg/Platinum.ogg
Binary files differ

diff --git a/data/sounds/alarms/material/ogg/Alarm8_48k.ogg b/data/sounds/alarms/material/ogg/Platinum_48k.ogg
similarity index 100%
rename from data/sounds/alarms/material/ogg/Alarm8_48k.ogg
rename to data/sounds/alarms/material/ogg/Platinum_48k.ogg
Binary files differ

diff --git a/data/sounds/notifications/material/ogg/Notification3.ogg b/data/sounds/notifications/material/ogg/Ariel.ogg
similarity index 100%
rename from data/sounds/notifications/material/ogg/Notification3.ogg
rename to data/sounds/notifications/material/ogg/Ariel.ogg
Binary files differ

diff --git a/data/sounds/notifications/material/ogg/Notification3_48k.ogg b/data/sounds/notifications/material/ogg/Ariel_48k.ogg
similarity index 100%
rename from data/sounds/notifications/material/ogg/Notification3_48k.ogg
rename to data/sounds/notifications/material/ogg/Ariel_48k.ogg
Binary files differ

diff --git a/data/sounds/notifications/material/ogg/Notification4.ogg b/data/sounds/notifications/material/ogg/Carme.ogg
similarity index 100%
rename from data/sounds/notifications/material/ogg/Notification4.ogg
rename to data/sounds/notifications/material/ogg/Carme.ogg
Binary files differ

diff --git a/data/sounds/notifications/material/ogg/Notification4_48k.ogg b/data/sounds/notifications/material/ogg/Carme_48k.ogg
similarity index 100%
rename from data/sounds/notifications/material/ogg/Notification4_48k.ogg
rename to data/sounds/notifications/material/ogg/Carme_48k.ogg
Binary files differ

diff --git a/data/sounds/notifications/material/ogg/Notification5.ogg b/data/sounds/notifications/material/ogg/Ceres.ogg
similarity index 100%
rename from data/sounds/notifications/material/ogg/Notification5.ogg
rename to data/sounds/notifications/material/ogg/Ceres.ogg
Binary files differ

diff --git a/data/sounds/notifications/material/ogg/Notification5_48k.ogg b/data/sounds/notifications/material/ogg/Ceres_48k.ogg
similarity index 100%
rename from data/sounds/notifications/material/ogg/Notification5_48k.ogg
rename to data/sounds/notifications/material/ogg/Ceres_48k.ogg
Binary files differ

diff --git a/data/sounds/notifications/material/ogg/Notification6.ogg b/data/sounds/notifications/material/ogg/Elara.ogg
similarity index 100%
rename from data/sounds/notifications/material/ogg/Notification6.ogg
rename to data/sounds/notifications/material/ogg/Elara.ogg
Binary files differ

diff --git a/data/sounds/notifications/material/ogg/Notification6_48k.ogg b/data/sounds/notifications/material/ogg/Elara_48k.ogg
similarity index 100%
rename from data/sounds/notifications/material/ogg/Notification6_48k.ogg
rename to data/sounds/notifications/material/ogg/Elara_48k.ogg
Binary files differ

diff --git a/data/sounds/notifications/material/ogg/Notification7.ogg b/data/sounds/notifications/material/ogg/Europa.ogg
similarity index 100%
rename from data/sounds/notifications/material/ogg/Notification7.ogg
rename to data/sounds/notifications/material/ogg/Europa.ogg
Binary files differ

diff --git a/data/sounds/notifications/material/ogg/Notification7_48k.ogg b/data/sounds/notifications/material/ogg/Europa_48k.ogg
similarity index 100%
rename from data/sounds/notifications/material/ogg/Notification7_48k.ogg
rename to data/sounds/notifications/material/ogg/Europa_48k.ogg
Binary files differ

diff --git a/data/sounds/notifications/material/ogg/Notification8.ogg b/data/sounds/notifications/material/ogg/Iapetus.ogg
similarity index 100%
rename from data/sounds/notifications/material/ogg/Notification8.ogg
rename to data/sounds/notifications/material/ogg/Iapetus.ogg
Binary files differ

diff --git a/data/sounds/notifications/material/ogg/Notification8_48k.ogg b/data/sounds/notifications/material/ogg/Iapetus_48k.ogg
similarity index 100%
rename from data/sounds/notifications/material/ogg/Notification8_48k.ogg
rename to data/sounds/notifications/material/ogg/Iapetus_48k.ogg
Binary files differ

diff --git a/data/sounds/notifications/material/ogg/Notification9.ogg b/data/sounds/notifications/material/ogg/Io.ogg
similarity index 100%
rename from data/sounds/notifications/material/ogg/Notification9.ogg
rename to data/sounds/notifications/material/ogg/Io.ogg
Binary files differ

diff --git a/data/sounds/notifications/material/ogg/Notification9_48k.ogg b/data/sounds/notifications/material/ogg/Io_48k.ogg
similarity index 100%
rename from data/sounds/notifications/material/ogg/Notification9_48k.ogg
rename to data/sounds/notifications/material/ogg/Io_48k.ogg
Binary files differ

diff --git a/data/sounds/notifications/material/ogg/Notification10.ogg b/data/sounds/notifications/material/ogg/Rhea.ogg
similarity index 100%
rename from data/sounds/notifications/material/ogg/Notification10.ogg
rename to data/sounds/notifications/material/ogg/Rhea.ogg
Binary files differ

diff --git a/data/sounds/notifications/material/ogg/Notification10_48k.ogg b/data/sounds/notifications/material/ogg/Rhea_48k.ogg
similarity index 100%
rename from data/sounds/notifications/material/ogg/Notification10_48k.ogg
rename to data/sounds/notifications/material/ogg/Rhea_48k.ogg
Binary files differ

diff --git a/data/sounds/notifications/material/ogg/Notification11.ogg b/data/sounds/notifications/material/ogg/Salacia.ogg
similarity index 100%
rename from data/sounds/notifications/material/ogg/Notification11.ogg
rename to data/sounds/notifications/material/ogg/Salacia.ogg
Binary files differ

diff --git a/data/sounds/notifications/material/ogg/Notification11_48k.ogg b/data/sounds/notifications/material/ogg/Salacia_48k.ogg
similarity index 100%
rename from data/sounds/notifications/material/ogg/Notification11_48k.ogg
rename to data/sounds/notifications/material/ogg/Salacia_48k.ogg
Binary files differ

diff --git a/data/sounds/notifications/material/ogg/Notification1.ogg b/data/sounds/notifications/material/ogg/Tethys.ogg
similarity index 100%
rename from data/sounds/notifications/material/ogg/Notification1.ogg
rename to data/sounds/notifications/material/ogg/Tethys.ogg
Binary files differ

diff --git a/data/sounds/notifications/material/ogg/Notification1_48k.ogg b/data/sounds/notifications/material/ogg/Tethys_48k.ogg
similarity index 100%
rename from data/sounds/notifications/material/ogg/Notification1_48k.ogg
rename to data/sounds/notifications/material/ogg/Tethys_48k.ogg
Binary files differ

diff --git a/data/sounds/notifications/material/ogg/Notification2.ogg b/data/sounds/notifications/material/ogg/Titan.ogg
similarity index 100%
rename from data/sounds/notifications/material/ogg/Notification2.ogg
rename to data/sounds/notifications/material/ogg/Titan.ogg
Binary files differ

diff --git a/data/sounds/notifications/material/ogg/Notification2_48k.ogg b/data/sounds/notifications/material/ogg/Titan_48k.ogg
similarity index 100%
rename from data/sounds/notifications/material/ogg/Notification2_48k.ogg
rename to data/sounds/notifications/material/ogg/Titan_48k.ogg
Binary files differ

diff --git a/data/sounds/ringtones/material/ogg/Ringtone4.ogg b/data/sounds/ringtones/material/ogg/Atria.ogg
similarity index 100%
rename from data/sounds/ringtones/material/ogg/Ringtone4.ogg
rename to data/sounds/ringtones/material/ogg/Atria.ogg
Binary files differ

diff --git a/data/sounds/ringtones/material/ogg/Ringtone4_48k.ogg b/data/sounds/ringtones/material/ogg/Atria_48k.ogg
similarity index 100%
rename from data/sounds/ringtones/material/ogg/Ringtone4_48k.ogg
rename to data/sounds/ringtones/material/ogg/Atria_48k.ogg
Binary files differ

diff --git a/data/sounds/ringtones/material/ogg/Ringtone5.ogg b/data/sounds/ringtones/material/ogg/Callisto.ogg
similarity index 100%
rename from data/sounds/ringtones/material/ogg/Ringtone5.ogg
rename to data/sounds/ringtones/material/ogg/Callisto.ogg
Binary files differ

diff --git a/data/sounds/ringtones/material/ogg/Ringtone5_48k.ogg b/data/sounds/ringtones/material/ogg/Callisto_48k.ogg
similarity index 100%
rename from data/sounds/ringtones/material/ogg/Ringtone5_48k.ogg
rename to data/sounds/ringtones/material/ogg/Callisto_48k.ogg
Binary files differ

diff --git a/data/sounds/ringtones/material/ogg/Ringtone6.ogg b/data/sounds/ringtones/material/ogg/Dione.ogg
similarity index 100%
rename from data/sounds/ringtones/material/ogg/Ringtone6.ogg
rename to data/sounds/ringtones/material/ogg/Dione.ogg
Binary files differ

diff --git a/data/sounds/ringtones/material/ogg/Ringtone6_48k.ogg b/data/sounds/ringtones/material/ogg/Dione_48k.ogg
similarity index 100%
rename from data/sounds/ringtones/material/ogg/Ringtone6_48k.ogg
rename to data/sounds/ringtones/material/ogg/Dione_48k.ogg
Binary files differ

diff --git a/data/sounds/ringtones/material/ogg/Ringtone7.ogg b/data/sounds/ringtones/material/ogg/Ganymede.ogg
similarity index 100%
rename from data/sounds/ringtones/material/ogg/Ringtone7.ogg
rename to data/sounds/ringtones/material/ogg/Ganymede.ogg
Binary files differ

diff --git a/data/sounds/ringtones/material/ogg/Ringtone7_48k.ogg b/data/sounds/ringtones/material/ogg/Ganymede_48k.ogg
similarity index 100%
rename from data/sounds/ringtones/material/ogg/Ringtone7_48k.ogg
rename to data/sounds/ringtones/material/ogg/Ganymede_48k.ogg
Binary files differ

diff --git a/data/sounds/ringtones/material/ogg/Ringtone8.ogg b/data/sounds/ringtones/material/ogg/Luna.ogg
similarity index 100%
rename from data/sounds/ringtones/material/ogg/Ringtone8.ogg
rename to data/sounds/ringtones/material/ogg/Luna.ogg
Binary files differ

diff --git a/data/sounds/ringtones/material/ogg/Ringtone8_48k.ogg b/data/sounds/ringtones/material/ogg/Luna_48k.ogg
similarity index 100%
rename from data/sounds/ringtones/material/ogg/Ringtone8_48k.ogg
rename to data/sounds/ringtones/material/ogg/Luna_48k.ogg
Binary files differ

diff --git a/data/sounds/ringtones/material/ogg/Ringtone9.ogg b/data/sounds/ringtones/material/ogg/Oberon.ogg
similarity index 100%
rename from data/sounds/ringtones/material/ogg/Ringtone9.ogg
rename to data/sounds/ringtones/material/ogg/Oberon.ogg
Binary files differ

diff --git a/data/sounds/ringtones/material/ogg/Ringtone9_48k.ogg b/data/sounds/ringtones/material/ogg/Oberon_48k.ogg
similarity index 100%
rename from data/sounds/ringtones/material/ogg/Ringtone9_48k.ogg
rename to data/sounds/ringtones/material/ogg/Oberon_48k.ogg
Binary files differ

diff --git a/data/sounds/ringtones/material/ogg/Ringtone10.ogg b/data/sounds/ringtones/material/ogg/Phobos.ogg
similarity index 100%
rename from data/sounds/ringtones/material/ogg/Ringtone10.ogg
rename to data/sounds/ringtones/material/ogg/Phobos.ogg
Binary files differ

diff --git a/data/sounds/ringtones/material/ogg/Ringtone10_48k.ogg b/data/sounds/ringtones/material/ogg/Phobos_48k.ogg
similarity index 100%
rename from data/sounds/ringtones/material/ogg/Ringtone10_48k.ogg
rename to data/sounds/ringtones/material/ogg/Phobos_48k.ogg
Binary files differ

diff --git a/data/sounds/ringtones/material/ogg/Ringtone11.ogg b/data/sounds/ringtones/material/ogg/Pyxis.ogg
similarity index 100%
rename from data/sounds/ringtones/material/ogg/Ringtone11.ogg
rename to data/sounds/ringtones/material/ogg/Pyxis.ogg
Binary files differ

diff --git a/data/sounds/ringtones/material/ogg/Ringtone11_48k.ogg b/data/sounds/ringtones/material/ogg/Pyxis_48k.ogg
similarity index 100%
rename from data/sounds/ringtones/material/ogg/Ringtone11_48k.ogg
rename to data/sounds/ringtones/material/ogg/Pyxis_48k.ogg
Binary files differ

diff --git a/data/sounds/ringtones/material/ogg/Ringtone12.ogg b/data/sounds/ringtones/material/ogg/Sedna.ogg
similarity index 100%
rename from data/sounds/ringtones/material/ogg/Ringtone12.ogg
rename to data/sounds/ringtones/material/ogg/Sedna.ogg
Binary files differ

diff --git a/data/sounds/ringtones/material/ogg/Ringtone12_48k.ogg b/data/sounds/ringtones/material/ogg/Sedna_48k.ogg
similarity index 100%
rename from data/sounds/ringtones/material/ogg/Ringtone12_48k.ogg
rename to data/sounds/ringtones/material/ogg/Sedna_48k.ogg
Binary files differ

diff --git a/data/sounds/ringtones/material/ogg/Ringtone1.ogg b/data/sounds/ringtones/material/ogg/Titania.ogg
similarity index 100%
rename from data/sounds/ringtones/material/ogg/Ringtone1.ogg
rename to data/sounds/ringtones/material/ogg/Titania.ogg
Binary files differ

diff --git a/data/sounds/ringtones/material/ogg/Ringtone1_48k.ogg b/data/sounds/ringtones/material/ogg/Titania_48k.ogg
similarity index 100%
rename from data/sounds/ringtones/material/ogg/Ringtone1_48k.ogg
rename to data/sounds/ringtones/material/ogg/Titania_48k.ogg
Binary files differ

diff --git a/data/sounds/ringtones/material/ogg/Ringtone2.ogg b/data/sounds/ringtones/material/ogg/Triton.ogg
similarity index 100%
rename from data/sounds/ringtones/material/ogg/Ringtone2.ogg
rename to data/sounds/ringtones/material/ogg/Triton.ogg
Binary files differ

diff --git a/data/sounds/ringtones/material/ogg/Ringtone2_48k.ogg b/data/sounds/ringtones/material/ogg/Triton_48k.ogg
similarity index 100%
rename from data/sounds/ringtones/material/ogg/Ringtone2_48k.ogg
rename to data/sounds/ringtones/material/ogg/Triton_48k.ogg
Binary files differ

diff --git a/data/sounds/ringtones/material/ogg/Ringtone3.ogg b/data/sounds/ringtones/material/ogg/Umbriel.ogg
similarity index 100%
rename from data/sounds/ringtones/material/ogg/Ringtone3.ogg
rename to data/sounds/ringtones/material/ogg/Umbriel.ogg
Binary files differ

diff --git a/data/sounds/ringtones/material/ogg/Ringtone3_48k.ogg b/data/sounds/ringtones/material/ogg/Umbriel_48k.ogg
similarity index 100%
rename from data/sounds/ringtones/material/ogg/Ringtone3_48k.ogg
rename to data/sounds/ringtones/material/ogg/Umbriel_48k.ogg
Binary files differ
commit	f56a3454821b9b15174d8b03eab229b52c88f547	[log] [tgz]
author	Dan Sandler <dsandler@android.com>	Thu Aug 28 00:37:18 2014 -0400
committer	Dan Sandler <dsandler@android.com>	Thu Aug 28 00:40:26 2014 -0400
tree	2ef99b412084c04712bbc09a1af53bf3f9e6dc41
parent	5232271a41323594ae406be7476b6ca2f08af3d8 [diff]