Merge "allow setting opengles property"

am: 4feec6ddb8  -s ours

Change-Id: I67c2a9060e8545b13ced8a40c373bae7dda665d0
This commit is contained in:
Jeff Vander Stoep 2017-10-05 18:41:30 +00:00 committed by android-build-merger
commit f0254bafda

Diff content is not available