OSDN Git Service

Merge "SurfaceFlinger: Add mode to apply position with resize." into nyc-dev
authorRobert Carr <racarr@google.com>
Tue, 7 Jun 2016 20:47:02 +0000 (20:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 7 Jun 2016 20:47:02 +0000 (20:47 +0000)
commit3fee6ca1d93c1d4b822d2dcd36c61f9722dd88b9
treecc66fde9a17d316375c622ec163a8cb1f37ae57c
parenteaaa9ae3212ebe9b3d2b9a592a7958afb15bf7d7
parentc3da482bb8081ee2c19b5965585267b8e21cfc7e
Merge "SurfaceFlinger: Add mode to apply position with resize." into nyc-dev
am: c3da482bb8

* commit 'c3da482bb8081ee2c19b5965585267b8e21cfc7e':
  SurfaceFlinger: Add mode to apply position with resize.

Change-Id: Icedb7a6e37da9338b1194edaa32a67257640969f
services/surfaceflinger/Layer.cpp
services/surfaceflinger/Layer.h
services/surfaceflinger/SurfaceFlinger.cpp
services/surfaceflinger/SurfaceFlinger_hwc1.cpp