723ec00af4
Conflicts: include/ui/Rect.h libs/ui/ISurfaceComposer.cpp |
||
---|---|---|
.. | ||
tests | ||
Android.mk | ||
BufferMapper.cpp | ||
Camera.cpp | ||
CameraParameters.cpp | ||
EventHub.cpp | ||
EventRecurrence.cpp | ||
FramebufferNativeWindow.cpp | ||
ICamera.cpp | ||
ICameraClient.cpp | ||
ICameraService.cpp | ||
IOverlay.cpp | ||
ISurface.cpp | ||
ISurfaceComposer.cpp | ||
ISurfaceFlingerClient.cpp | ||
KeyCharacterMap.cpp | ||
KeyLayoutMap.cpp | ||
KeyLayoutMap.h | ||
LayerState.cpp | ||
MODULE_LICENSE_APACHE2 | ||
NOTICE | ||
Overlay.cpp | ||
PixelFormat.cpp | ||
Rect.cpp | ||
Region.cpp | ||
Surface.cpp | ||
SurfaceComposerClient.cpp | ||
SurfaceFlingerSynchro.cpp | ||
Time.cpp |