OSDN Git Service

Merge "Reinstate SurfaceView Background from N" into oc-dev
authorRobert Carr <racarr@google.com>
Tue, 6 Jun 2017 00:09:17 +0000 (00:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 6 Jun 2017 00:09:17 +0000 (00:09 +0000)
am: 71044d6ba1

Change-Id: I5a4e8a5c8c45add308b115bc447f85393d572e00


Trivial merge