Merge "Fix bad merge of lockscreen music forward button" into gingerbread

        mForwardIcon.setOnClickListener(new View.OnClickListener() {

            public void onClick(View v) {

                mCallback.pokeWakelock();

                Intent intent;

                intent = new Intent("com.android.music.musicservicecommand.next");

                getContext().sendBroadcast(intent);

                sendMediaButtonEvent(KeyEvent.KEYCODE_MEDIA_NEXT);

            }

        });