tree ea5a878b5c4b1670975d104171e7d7e1390a0696
parent 69eaed3663318ca4b7f881c2fa85b59958160ca0
parent efb93455b3a95458d68897c3b38f7f98046c697e
author Fabien Sanglard <sanglardf@google.com> 1476917211 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1476917212 +0000

Merge "Delete RenderEngine path for OpenGL ES 1.0/1.1"