OSDN Git Service

Merge "GLConsumer: add build-time disable of gpu protected content" into nyc-dev
authorJesse Hall <jessehall@google.com>
Wed, 4 May 2016 17:52:14 +0000 (17:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 4 May 2016 17:52:14 +0000 (17:52 +0000)
commitf1d0fda80c75391be36f8577f1cd888650ebb2ac
tree00d10f73510c681d7994de0a811bec9aea77bc75
parentfc44e400cde1266c70eb29c7f5465288a85c1507
parent0b546c408686e4353dfe4b3a12be1048b966944d
Merge "GLConsumer: add build-time disable of gpu protected content" into nyc-dev
am: 0b546c4086

* commit '0b546c408686e4353dfe4b3a12be1048b966944d':
  GLConsumer: add build-time disable of gpu protected content

Change-Id: I9775e2659cded403409367819f70a5833a8bf2c9