OSDN Git Service

Merge "Keep protected content in EGLImage attrs as needed." am: 5a03327fa8 am: e86b7f...
authorCraig Donner <cdonner@google.com>
Tue, 8 Nov 2016 20:30:11 +0000 (20:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 8 Nov 2016 20:30:11 +0000 (20:30 +0000)
am: 7f612d4830

Change-Id: I3e26e9d5cb164154c3408a165c90ec534542c2c0


Trivial merge