| commit | 4d6d0965c2cfddf9a7c02a97e53502d2ae870873 | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Wed Jul 31 17:54:19 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 31 17:54:19 2013 -0700 |
| tree | 989d91c6659bf534788b9ef585b2b474bb9be8ad | |
| parent | 16616daef75adc7c9deef3dfad6a0e6d40bb3530 [diff] | |
| parent | 4cea60d3a9c5fb5aac18288d30ad8851ac031d7f [diff] |
am 4cea60d3: am 18dc709e: Merge "Fix gles3jni build with clang at android-11" * commit '4cea60d3a9c5fb5aac18288d30ad8851ac031d7f': Fix gles3jni build with clang at android-11