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

Commit 5f807423 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am d670b8c6: Merge change 3981 into donut 

Merge commit 'd670b8c6'

* commit 'd670b8c6':
  Removed trailing whitespaces.
parents 451a37ed d670b8c6

include/media/IMediaPlayerService.h

+1 −2
Original line number Diff line number Diff line
@@ -57,4 +57,3 @@ public: 
}; // namespace android



#endif // ANDROID_IMEDIAPLAYERSERVICE_H

include/media/MediaPlayerInterface.h

+0 −1
Original line number Diff line number Diff line
@@ -123,4 +123,3 @@ public: 




#endif // ANDROID_MEDIAPLAYERINTERFACE_H

media/libmedia/IMediaPlayerService.cpp

+0 −1
Original line number Diff line number Diff line
@@ -189,4 +189,3 @@ status_t BnMediaPlayerService::onTransact( 
// ----------------------------------------------------------------------------



}; // namespace android

media/libmedia/mediaplayer.cpp

+2 −2

File changed.

Contains only whitespace changes.

include/media/mediaplayer.h

+1 −1

File changed.

Contains only whitespace changes.

media/java/android/media/MediaPlayer.java

+178 −178

File changed.

Contains only whitespace changes.

media/jni/android_media_MediaPlayer.cpp

+5 −5

File changed.

Contains only whitespace changes.