OSDN Git Service

Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev am...
authorRobert Carr <racarr@google.com>
Tue, 13 Jun 2017 00:43:56 +0000 (00:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 00:43:56 +0000 (00:43 +0000)
am: 2fa5800da9

Change-Id: I83c4a2e592b7385b1aa6dc3157bd6ea5950c624a


Trivial merge