tree 7ee237d5084ae4361ade3fa6eca6bae70ba45700
parent 52cfea9c35ba0c131384577f6a0f95b31f48149c
parent 55427a6650cb24da345be2cfb28e94e254a64249
author Robert Carr <racarr@google.com> 1467171204 +0000
committer android-build-merger <android-build-merger@google.com> 1467171204 +0000

Merge \"Only use one SurfaceControlWithBackground per AppToken.\" into nyc-dev
am: 55427a6650

Change-Id: I8f4eae6fe2ab09cd0b14473cba7d4dbbc42dc469