OSDN Git Service

Merge \"Only use one SurfaceControlWithBackground per AppToken.\" into nyc-dev
authorRobert Carr <racarr@google.com>
Wed, 29 Jun 2016 03:33:24 +0000 (03:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 29 Jun 2016 03:33:24 +0000 (03:33 +0000)
commit5bf74ae1b9102ad2030ffaad4f27f4f0cf783a62
tree7ee237d5084ae4361ade3fa6eca6bae70ba45700
parent52cfea9c35ba0c131384577f6a0f95b31f48149c
parent55427a6650cb24da345be2cfb28e94e254a64249
Merge \"Only use one SurfaceControlWithBackground per AppToken.\" into nyc-dev
am: 55427a6650

Change-Id: I8f4eae6fe2ab09cd0b14473cba7d4dbbc42dc469
services/core/java/com/android/server/wm/AppWindowToken.java
services/core/java/com/android/server/wm/WindowSurfaceController.java