diff options
| author | Tom O'Neill <tomo@google.com> | 2014-09-08 19:32:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-08 19:32:42 +0000 |
| commit | 4d5f69f20e636523d69574d2f2073c998226eb8a (patch) | |
| tree | d836c89d7447d59772ca272a785c7cd77812164a /core/jni/android_opengl_GLES11.cpp | |
| parent | 6e13a5c8a1c39b0676805dda3ecb258486d6c1b1 (diff) | |
| parent | 9f8c80df1dbaf927888842775e9cfdda55dbe30a (diff) | |
| download | frameworks_base-4d5f69f20e636523d69574d2f2073c998226eb8a.zip frameworks_base-4d5f69f20e636523d69574d2f2073c998226eb8a.tar.gz frameworks_base-4d5f69f20e636523d69574d2f2073c998226eb8a.tar.bz2 | |
am 8fff150b: Merge "Fix a STOPSHIP" into lmp-dev
* commit '8fff150bb5c9971c5ba25cf9568a2944ff951c04':
Fix a STOPSHIP
Diffstat (limited to 'core/jni/android_opengl_GLES11.cpp')
0 files changed, 0 insertions, 0 deletions