OSDN Git Service

Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev
authorRobert Carr <racarr@google.com>
Mon, 12 Jun 2017 23:45:37 +0000 (23:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 12 Jun 2017 23:45:37 +0000 (23:45 +0000)
am: 42b3610adc

Change-Id: Ib1001156c0a68f695d755da51af5f0548ccbacba


Trivial merge