* Play a sound. This is done on key up since we don't want the
                 * sound to play when a user holds down volume down to mute.
                 */
<<<<<<< HEAD
                if (mUseMasterVolume) {
                    if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
                        adjustMasterVolume(ADJUST_SAME, FLAG_PLAY_SOUND);
                    }
                } else {
                    int flags = FLAG_PLAY_SOUND;
                    adjustSuggestedStreamVolume(
                            ADJUST_SAME,
                            stream,
                            flags);
=======
                if (mUseVolumeKeySounds) {
                    if (mUseMasterVolume) {
                        if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
                            adjustMasterVolume(ADJUST_SAME, FLAG_PLAY_SOUND);
                        }
                    } else {
                        int flags = FLAG_PLAY_SOUND;
                        if (mVolumeControlStream != -1) {
                            stream = mVolumeControlStream;
                            flags |= FLAG_FORCE_STREAM;
                        }
                        adjustSuggestedStreamVolume(
                                ADJUST_SAME,
                                stream,
                                flags);
                    }
>>>>>>> b89ce434993cca883818ab38f98c0b29d77e7aa2
                }
                mVolumeKeyUpTime = SystemClock.uptimeMillis();
                break;

                        int flags = FLAG_PLAY_SOUND;
                        adjustSuggestedStreamVolume(
                 * Play a sound. This is done on key up since we don't want the
                 * sound to play when a user holds down volume down to mute.
                 */
                if (mUseVolumeKeySounds) {
                    if (mUseMasterVolume) {
                        if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
                            adjustMasterVolume(ADJUST_SAME, FLAG_PLAY_SOUND);
                        }
                    } else {
                                ADJUST_SAME,
                                stream,
                                flags);
                    }
                }
                mVolumeKeyUpTime = SystemClock.uptimeMillis();
                break;