| commit | 9ab356fc54f8d09ddd9d31f8bfcf6a95e703ed1c | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Fri May 20 21:49:11 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 20 21:49:11 2016 +0000 |
| tree | a2c6891b6de99fe70384ecc76f9a8cd9693f144b | |
| parent | 3d305a18f771f293b6196f95eeb41c098e7e051f [diff] | |
| parent | 889709302b5c93d8955407a6943a5720c4c7c45f [diff] |
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