diff options
| author | Chien-Yu Chen <cychen@google.com> | 2015-10-07 23:11:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-07 23:11:20 +0000 |
| commit | 02e4400cc734079bcc275d14a9ae4d16609403c8 (patch) | |
| tree | 25864edac339859581b421150f78e5e67ced190b /media | |
| parent | a71bb6b986156b8bd32e387afc74b1ff066fd2a7 (diff) | |
| parent | ab7812750bca947abc9e8b1ce73a3041dbc2f2a9 (diff) | |
| download | frameworks_base-02e4400cc734079bcc275d14a9ae4d16609403c8.zip frameworks_base-02e4400cc734079bcc275d14a9ae4d16609403c8.tar.gz frameworks_base-02e4400cc734079bcc275d14a9ae4d16609403c8.tar.bz2 | |
am ab781275: Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev
* commit 'ab7812750bca947abc9e8b1ce73a3041dbc2f2a9':
MediaActionSound: Fix video stop sound
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/MediaActionSound.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/MediaActionSound.java b/media/java/android/media/MediaActionSound.java index 2f4d136..1fee587 100644 --- a/media/java/android/media/MediaActionSound.java +++ b/media/java/android/media/MediaActionSound.java @@ -52,7 +52,7 @@ public class MediaActionSound { "/system/media/audio/ui/camera_click.ogg", "/system/media/audio/ui/camera_focus.ogg", "/system/media/audio/ui/VideoRecord.ogg", - "/system/media/audio/ui/VideoRecord.ogg" + "/system/media/audio/ui/VideoStop.ogg" }; private static final String TAG = "MediaActionSound"; |