OSDN Git Service

Merge "Fix warnings in framworks/native/opengl/include" am: d12c9369d5 am: 7354c237ea
authorColin Cross <ccross@android.com>
Fri, 18 Nov 2016 02:00:54 +0000 (02:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 18 Nov 2016 02:00:54 +0000 (02:00 +0000)
commitea7e880c6877778e3deb6cec066deb233525eb49
tree3e7bf06b2b1eb272b1e15a81232cd2a5551c2638
parent803ed2903b90e69af8644b34637994ec74e562af
parent2c160be5b06b25172236432f8cfce48dfd27e96d
Merge "Fix warnings in framworks/native/opengl/include" am: d12c9369d5 am: 7354c237ea
am: 2c160be5b0

Change-Id: I4b3b0a0cab4dc51a673fe2da4d72f26c74c5fb23