OSDN Git Service

Merge \"Revert \"GLConsumer: add build-time disable of gpu protected content\"\"...
authorCraig Donner <cdonner@google.com>
Mon, 13 Jun 2016 23:25:23 +0000 (23:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 13 Jun 2016 23:25:23 +0000 (23:25 +0000)
commit4931fb298e076212981b2acae6752743d7340f02
tree00e8f3e2789a1ac9df388752a4aa930a5ec6e0da
parent8fc10c310ec3fe66d68ea2a90702ee31b329750a
parente1e1e75173d557466e824782c61802a8415c7073
Merge \"Revert \"GLConsumer: add build-time disable of gpu protected content\"\" into nyc-dev
am: e1e1e75173

Change-Id: Iea28323a8e7bd2333d396b70703ac4b1a99b1911
libs/gui/Android.mk