summaryrefslogtreecommitdiff
path: root/include/surfaceflinger/SurfaceComposerClient.h
diff options
context:
space:
mode:
author Jamie Gennis <jgennis@google.com> 2011-10-12 13:04:36 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-10-12 13:04:36 -0700
commitc2091130ae1a1b37956f49d0fe81fb82413cd2dd (patch)
tree66f938b4ed5ccbf59259c7d97853226399d273a7 /include/surfaceflinger/SurfaceComposerClient.h
parent485bc5543880ec7691ff935089a749037d2ecd14 (diff)
parent075e4c3d2e6a8a9eb3506dfedc8da938fb65fb65 (diff)
am 075e4c3d: Merge "SurfaceFlinger: update orientation via transactions" into ics-mr0
* commit '075e4c3d2e6a8a9eb3506dfedc8da938fb65fb65': SurfaceFlinger: update orientation via transactions
Diffstat (limited to 'include/surfaceflinger/SurfaceComposerClient.h')
-rw-r--r--include/surfaceflinger/SurfaceComposerClient.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/surfaceflinger/SurfaceComposerClient.h b/include/surfaceflinger/SurfaceComposerClient.h
index ace0735c664e..14e5b23a71f9 100644
--- a/include/surfaceflinger/SurfaceComposerClient.h
+++ b/include/surfaceflinger/SurfaceComposerClient.h
@@ -195,4 +195,3 @@ public:
}; // namespace android
#endif // ANDROID_SF_SURFACE_COMPOSER_CLIENT_H
-