| commit | 889709302b5c93d8955407a6943a5720c4c7c45f | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Fri May 20 21:46:56 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 20 21:46:56 2016 +0000 |
| tree | d4e1d8e3d1b20892cc55f0a7bb3220940f9700e4 | |
| parent | 5418d771835c120ea12e25bc5e298623425002e1 [diff] | |
| parent | 44d93a063c34db90712f158c37d9329709282b5f [diff] |
resolve merge conflicts of e375c68 to nyc-dev-plus-aosp am: 44d93a063c * commit '44d93a063c34db90712f158c37d9329709282b5f': Fix misc-macro-parentheses warnings in opengl. Change-Id: Id1f9c8c8111d614e941331bf3a7ecb89713ca139