OSDN Git Service

Merge "Fix const issues in preparation for libcxx rebase." am: c3aab193bf
authorDan Austin <danielaustin@google.com>
Wed, 25 May 2016 20:57:38 +0000 (20:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 25 May 2016 20:57:38 +0000 (20:57 +0000)
commitbf3f6190b61921383f3615e75dcb60db8368f1dd
treed504ab826c3e121df38a1b778050b02f5affc2df
parentde2df84ba9cfdabb2d0b4956b9d81ca1030dd9fe
parentd0347bc119c08c49db485cb0786372e0c2a7902d
Merge "Fix const issues in preparation for libcxx rebase." am: c3aab193bf
am: d0347bc119

* commit 'd0347bc119c08c49db485cb0786372e0c2a7902d':
  Fix const issues in preparation for libcxx rebase.

Change-Id: Icdc695f2c42ec0ed97610c31055d1c643aca7b3d
opengl/system/GLESv2_enc/GL2Encoder.cpp