tree a2c6891b6de99fe70384ecc76f9a8cd9693f144b
parent 3d305a18f771f293b6196f95eeb41c098e7e051f
parent 889709302b5c93d8955407a6943a5720c4c7c45f
author Chih-Hung Hsieh <chh@google.com> 1463780951 +0000
committer android-build-merger <android-build-merger@google.com> 1463780951 +0000

resolve merge conflicts of e375c68 to nyc-dev-plus-aosp am: 44d93a063c
am: 889709302b

* commit '889709302b5c93d8955407a6943a5720c4c7c45f':
  Fix misc-macro-parentheses warnings in opengl.

Change-Id: If4d9e6039f2459ff0913e465c88e232090cdf348