summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2015-03-23 15:56:19 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-23 15:56:20 +0000
commite063c308aaeaf85c9c41fda5df083a8aa90bdb24 (patch)
treef4ec5b1176ca063f48644f4abe1c86eb9e7327e9 /media
parent0fe431544e5320a58508fb0533063d36dad1a473 (diff)
parentd2027336b45f524a196403d351ec317782793792 (diff)
downloadframeworks_av-e063c308aaeaf85c9c41fda5df083a8aa90bdb24.zip
frameworks_av-e063c308aaeaf85c9c41fda5df083a8aa90bdb24.tar.gz
frameworks_av-e063c308aaeaf85c9c41fda5df083a8aa90bdb24.tar.bz2
Merge "Whitespace"
Diffstat (limited to 'media')
-rw-r--r--media/libmedia/IMediaHTTPConnection.cpp3
-rw-r--r--media/libmedia/IMediaHTTPService.cpp3
2 files changed, 2 insertions, 4 deletions
diff --git a/media/libmedia/IMediaHTTPConnection.cpp b/media/libmedia/IMediaHTTPConnection.cpp
index 7e26ee6..2ff7658 100644
--- a/media/libmedia/IMediaHTTPConnection.cpp
+++ b/media/libmedia/IMediaHTTPConnection.cpp
@@ -178,5 +178,4 @@ private:
IMPLEMENT_META_INTERFACE(
MediaHTTPConnection, "android.media.IMediaHTTPConnection");
-} // namespace android
-
+} // namespace android
diff --git a/media/libmedia/IMediaHTTPService.cpp b/media/libmedia/IMediaHTTPService.cpp
index 1260582..f30d0f3 100644
--- a/media/libmedia/IMediaHTTPService.cpp
+++ b/media/libmedia/IMediaHTTPService.cpp
@@ -54,5 +54,4 @@ struct BpMediaHTTPService : public BpInterface<IMediaHTTPService> {
IMPLEMENT_META_INTERFACE(
MediaHTTPService, "android.media.IMediaHTTPService");
-} // namespace android
-
+} // namespace android