OSDN Git Service

Merge "Support EGL_EXT_protected_content in GLConsumer." into nyc-dev
authorCraig Donner <cdonner@google.com>
Fri, 29 Apr 2016 20:53:19 +0000 (20:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 29 Apr 2016 20:53:19 +0000 (20:53 +0000)
commit1bd3ef2f3b6f55079dc4c02b37b4c7cf0fe5f521
tree199ce7d0d9afb7fba0a589572d9f57415ca4a4ed
parentbe5b94e9c6fab7638d1cba6f86069cff3fc9d20b
parent188b9f00358d1f9f880b6d9deadc0b54f07b888e
Merge "Support EGL_EXT_protected_content in GLConsumer." into nyc-dev
am: 188b9f0035

* commit '188b9f00358d1f9f880b6d9deadc0b54f07b888e':
  Support EGL_EXT_protected_content in GLConsumer.

Change-Id: I60d7c49a05480950994389029dec6d359f77dfce