Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25adf474 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Fix indentation and whitespace"

parents 927cc6c7 fb2ab9ef

media/libmedia/AudioTrack.cpp

+0 −1
Original line number Diff line number Diff line
@@ -1467,4 +1467,3 @@ bool audio_track_cblk_t::tryLock() 
// -------------------------------------------------------------------------



}; // namespace android

services/audioflinger/AudioMixer.cpp

+47 −48
Original line number Diff line number Diff line
@@ -1221,4 +1221,3 @@ void AudioMixer::process__TwoTracks16BitsStereoNoResampling(state_t* state) 


// ----------------------------------------------------------------------------

}; // namespace android

services/audioflinger/AudioFlinger.cpp

+6 −6

File changed.

Contains only whitespace changes.

core/jni/android_media_AudioTrack.cpp

+1 −1

File changed.

Contains only whitespace changes.

media/java/android/media/AudioTrack.java

+25 −25

File changed.

Contains only whitespace changes.