tree 60ade9b8085e1af9b5aa97abfb2420078bdd997b
parent 9698c2f193666ab506a6edf113c5a77d0d0acb3b
parent 3424c8d1ee58f960788af697fb0872709678def4
author Colin Cross <ccross@android.com> 1481762423 +0000
committer android-build-merger <android-build-merger@google.com> 1481762423 +0000

Merge "Fix more warnings in framworks/native/opengl/include" am: e714200784 am: caf04ed42f am: 7e7f3d4672
am: 3424c8d1ee

Change-Id: I650265920a5459fd63b124b60957c3a6e89cdd6e