OSDN Git Service

Merge "SurfaceTexture: setConsumerIsProtected" into oc-dev
authorJiwen Cai <jiwen@google.com>
Tue, 2 May 2017 16:04:26 +0000 (16:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 May 2017 16:04:26 +0000 (16:04 +0000)
am: 9967a4d3af

Change-Id: If2ec26782f82e0f22deb7d952b79436e30a91867


Trivial merge