OSDN Git Service

Merge \"Merge \\\"Only use one SurfaceControlWithBackground per AppToken.\\\" into...
authorRob Carr <racarr@google.com>
Wed, 29 Jun 2016 03:51:10 +0000 (03:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 29 Jun 2016 03:51:10 +0000 (03:51 +0000)
commit74a6ce8f2e1d3ff82246d26ecbcc2acc3bb9a434
tree0330f7babd161b6c35a4bc7cf5487776c8f040ac
parenta6a76e61bb4992b1f69ff1940d2d79c451baf9bb
parentef8b12fd2aff653e40a5d16cec1ffbbb2d569104
Merge \"Merge \\\"Only use one SurfaceControlWithBackground per AppToken.\\\" into nyc-dev am: 55427a6650 am: 5bf74ae1b9\" into nyc-mr1-dev-plus-aosp
am: ef8b12fd2a

Change-Id: Ib4def8be7883cd4a524207ad35b1adb931a6b3da